diff options
author | Colin Cross <ccross@android.com> | 2018-04-19 15:25:19 -0700 |
---|---|---|
committer | Colin Cross <ccross@android.com> | 2018-05-03 14:38:12 -0700 |
commit | 6a43fdbc3b737dfda1beae95e7a7240b04a94c4b (patch) | |
tree | d937a53f8b8be7d9c2d557cd6996dad754a77536 /java | |
parent | 42b96648ca504b0a89481ebc8a7c01d2bb079882 (diff) | |
download | build_soong-6a43fdbc3b737dfda1beae95e7a7240b04a94c4b.tar.gz build_soong-6a43fdbc3b737dfda1beae95e7a7240b04a94c4b.tar.bz2 build_soong-6a43fdbc3b737dfda1beae95e7a7240b04a94c4b.zip |
Remove product-specific flags from android_library modules
Static android libraries should not get the product-specific
flags.
Bug: 73724997
Test: m checkbuild
Change-Id: I89e8c0a3fb788b18ee6603e9d21c9b9a5275f42f
Merged-In: I89e8c0a3fb788b18ee6603e9d21c9b9a5275f42f
(cherry picked from commit e78dcd313c0a4e0a1e8c32b26fdc62bd6de93da2)
Diffstat (limited to 'java')
-rw-r--r-- | java/aar.go | 18 | ||||
-rw-r--r-- | java/app.go | 22 |
2 files changed, 22 insertions, 18 deletions
diff --git a/java/aar.go b/java/aar.go index 36f619d3..16d82af4 100644 --- a/java/aar.go +++ b/java/aar.go @@ -76,14 +76,11 @@ func (a *aapt) aapt2Flags(ctx android.ModuleContext, sdkVersion string) (flags [ hasVersionCode := false hasVersionName := false - hasProduct := false for _, f := range a.aaptProperties.Aaptflags { if strings.HasPrefix(f, "--version-code") { hasVersionCode = true } else if strings.HasPrefix(f, "--version-name") { hasVersionName = true - } else if strings.HasPrefix(f, "--product") { - hasProduct = true } } @@ -140,21 +137,6 @@ func (a *aapt) aapt2Flags(ctx android.ModuleContext, sdkVersion string) (flags [ linkFlags = append(linkFlags, "--min-sdk-version "+sdkVersion) linkFlags = append(linkFlags, "--target-sdk-version "+sdkVersion) - // Product characteristics - if !hasProduct && len(ctx.Config().ProductAAPTCharacteristics()) > 0 { - linkFlags = append(linkFlags, "--product", ctx.Config().ProductAAPTCharacteristics()) - } - - // Product AAPT config - for _, aaptConfig := range ctx.Config().ProductAAPTConfig() { - linkFlags = append(linkFlags, "-c", aaptConfig) - } - - // Product AAPT preferred config - if len(ctx.Config().ProductAAPTPreferredConfig()) > 0 { - linkFlags = append(linkFlags, "--preferred-density", ctx.Config().ProductAAPTPreferredConfig()) - } - // Version code if !hasVersionCode { linkFlags = append(linkFlags, "--version-code", ctx.Config().PlatformSdkVersion()) diff --git a/java/app.go b/java/app.go index 3e24ebc8..dd83a0a7 100644 --- a/java/app.go +++ b/java/app.go @@ -86,6 +86,28 @@ func (a *AndroidApp) GenerateAndroidBuildActions(ctx android.ModuleContext) { a.properties.Instrument = true } + hasProduct := false + for _, f := range a.aaptProperties.Aaptflags { + if strings.HasPrefix(f, "--product") { + hasProduct = true + } + } + + // Product characteristics + if !hasProduct && len(ctx.Config().ProductAAPTCharacteristics()) > 0 { + linkFlags = append(linkFlags, "--product", ctx.Config().ProductAAPTCharacteristics()) + } + + // Product AAPT config + for _, aaptConfig := range ctx.Config().ProductAAPTConfig() { + linkFlags = append(linkFlags, "-c", aaptConfig) + } + + // Product AAPT preferred config + if len(ctx.Config().ProductAAPTPreferredConfig()) > 0 { + linkFlags = append(linkFlags, "--preferred-density", ctx.Config().ProductAAPTPreferredConfig()) + } + // TODO: LOCAL_PACKAGE_OVERRIDES // $(addprefix --rename-manifest-package , $(PRIVATE_MANIFEST_PACKAGE_NAME)) \ |