diff options
| author | 2019-07-26 09:50:07 -0700 | |
|---|---|---|
| committer | 2019-07-26 09:50:07 -0700 | |
| commit | ab6de410ebe2ae5de0a2a7b58fae0cdf068a6b76 (patch) | |
| tree | d502805c75bc898301cd7f2ae2b1a6cd579b3cc7 /java/androidmk.go | |
| parent | 773c4098b2281abadcb15bc83a73f34df313f0e3 (diff) | |
| parent | ccca43f986ed54b0712bba286ae61fecfa4ee422 (diff) | |
Merge "Revert "Revert "Split Java libraries per apex""" am: c89fe6253f
am: ccca43f986
Change-Id: I1b94c756c89c7eb9b4d67f3dc271c58a894e8d8c
Diffstat (limited to 'java/androidmk.go')
| -rw-r--r-- | java/androidmk.go | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/java/androidmk.go b/java/androidmk.go index 90fdd0f77..ad0e171f3 100644 --- a/java/androidmk.go +++ b/java/androidmk.go @@ -55,6 +55,11 @@ func (library *Library) AndroidMkHostDex(w io.Writer, name string, data android. } func (library *Library) AndroidMk() android.AndroidMkData { + if !library.IsForPlatform() { + return android.AndroidMkData{ + Disabled: true, + } + } return android.AndroidMkData{ Class: "JAVA_LIBRARIES", OutputFile: android.OptionalPathForPath(library.outputFile), @@ -141,6 +146,11 @@ func (j *TestHelperLibrary) AndroidMk() android.AndroidMkData { } func (prebuilt *Import) AndroidMk() android.AndroidMkData { + if !prebuilt.IsForPlatform() { + return android.AndroidMkData{ + Disabled: true, + } + } return android.AndroidMkData{ Class: "JAVA_LIBRARIES", OutputFile: android.OptionalPathForPath(prebuilt.combinedClasspathFile), @@ -157,6 +167,11 @@ func (prebuilt *Import) AndroidMk() android.AndroidMkData { } func (prebuilt *DexImport) AndroidMk() android.AndroidMkData { + if !prebuilt.IsForPlatform() { + return android.AndroidMkData{ + Disabled: true, + } + } return android.AndroidMkData{ Class: "JAVA_LIBRARIES", OutputFile: android.OptionalPathForPath(prebuilt.maybeStrippedDexJarFile), |