diff options
author | Lukacs Berki <lberki@google.com> | 2017-02-03 08:40:51 +0000 |
---|---|---|
committer | Yun Peng <pcloudy@google.com> | 2017-02-03 10:26:20 +0000 |
commit | 41c2a26eef89167e807cbc9f33487dc66bb757d3 (patch) | |
tree | 283480700bba384acac28304120026891fdb53a6 /src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCompileAction.java | |
parent | 3b619957535d7ad92517cfe8f27c383a424a16d9 (diff) |
Remove AbstractAction#getInputFilesForExtraAction().
This method was used to return the discovered inputs for extra actions, but it turns out that we can use #discoverInputs() just as well.
Note that this makes it possible for #discoverInputs() to be called more than once per action instance (once for the action and once for each extra action), but this appears to work. A followup change may be able to dispense with that, but let's take baby steps for now.
Also note that this introduces synchronization between an action and its associated extra action.
--
PiperOrigin-RevId: 146450132
MOS_MIGRATED_REVID=146450132
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCompileAction.java')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCompileAction.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCompileAction.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCompileAction.java index 55e1baefff..f8ee247c7f 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCompileAction.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCompileAction.java @@ -186,8 +186,8 @@ public class ObjcCompileAction extends SpawnAction { return true; } - @Override - public Iterable<Artifact> discoverInputs(ActionExecutionContext actionExecutionContext) + public synchronized Iterable<Artifact> discoverInputs( + ActionExecutionContext actionExecutionContext) throws ActionExecutionException, InterruptedException { if (headersListFile != null) { discoveredInputs = findRequiredHeaderInputs(); |