diff options
| author | 2017-10-23 21:12:13 +0000 | |
|---|---|---|
| committer | 2017-10-23 21:12:13 +0000 | |
| commit | 254aaec32870c16d97a7c8b1320c250f71c5d3f7 (patch) | |
| tree | 7f476455c123397170caa96b8f215cafda7c8a07 /java/java.go | |
| parent | d8cc795f86a2a69b73fa3abad9688158b6dcc351 (diff) | |
| parent | e243c231da6fca6c40f8075bf014094f4ec0fce0 (diff) | |
Merge changes from topic "soong_prebuilts_misc_common"
* changes:
Fix finding src directory for aidl
Support multiple outputs in genrules with depfile: true
Support installable prebuilt jars
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/java/java.go b/java/java.go index 497b28510..8941b4d7f 100644 --- a/java/java.go +++ b/java/java.go @@ -374,7 +374,7 @@ func (j *Module) aidlFlags(ctx android.ModuleContext, aidlPreprocess android.Opt flags = append(flags, android.JoinWithPrefix(j.exportAidlIncludeDirs.Strings(), "-I")) flags = append(flags, android.JoinWithPrefix(localAidlIncludes.Strings(), "-I")) flags = append(flags, "-I"+android.PathForModuleSrc(ctx).String()) - if src := android.ExistentPathForSource(ctx, "", "src"); src.Valid() { + if src := android.ExistentPathForSource(ctx, "", ctx.ModuleDir(), "src"); src.Valid() { flags = append(flags, "-I"+src.String()) } @@ -920,6 +920,8 @@ type ImportProperties struct { Jars []string Sdk_version string + + Installable *bool } type Import struct { |