From f0f7ca8335cca669dd524b39d52997c28eb59e48 Mon Sep 17 00:00:00 2001 From: Jiyong Park Date: Thu, 25 Jul 2019 04:38:02 +0000 Subject: [PATCH] Revert "Split Java libraries per apex" This reverts commit aa53324ac8308d974435cf2c8566835b87e3e05d. Reason for revert: b/138337109 (broke ndk build) Change-Id: I9497cb4337add3f8c491a684bcaadea3bdbfaa85 --- apex/apex_test.go | 32 ++------------------------------ java/androidmk.go | 15 --------------- java/hiddenapi_singleton.go | 8 -------- java/java.go | 11 +---------- 4 files changed, 3 insertions(+), 63 deletions(-) diff --git a/apex/apex_test.go b/apex/apex_test.go index e44163e97..bb0c4c5be 100644 --- a/apex/apex_test.go +++ b/apex/apex_test.go @@ -91,8 +91,6 @@ func testApexContext(t *testing.T, bp string) (*android.TestContext, android.Con ctx.RegisterModuleType("sh_binary", android.ModuleFactoryAdaptor(android.ShBinaryFactory)) ctx.RegisterModuleType("android_app_certificate", android.ModuleFactoryAdaptor(java.AndroidAppCertificateFactory)) ctx.RegisterModuleType("filegroup", android.ModuleFactoryAdaptor(android.FileGroupFactory)) - ctx.RegisterModuleType("java_library", android.ModuleFactoryAdaptor(java.LibraryFactory)) - ctx.PreArchMutators(func(ctx android.RegisterMutatorsContext) { ctx.BottomUp("prebuilts", android.PrebuiltMutator).Parallel() }) @@ -207,7 +205,6 @@ func testApexContext(t *testing.T, bp string) (*android.TestContext, android.Con "mytest3.cpp": nil, "myprebuilt": nil, "my_include": nil, - "foo/bar/MyClass.java": nil, "vendor/foo/devkeys/test.x509.pem": nil, "vendor/foo/devkeys/test.pk8": nil, "testkey.x509.pem": nil, @@ -283,8 +280,7 @@ func TestBasicApex(t *testing.T) { both: { binaries: ["foo",], } - }, - java_libs: ["myjar"], + } } apex { @@ -342,23 +338,6 @@ func TestBasicApex(t *testing.T) { stl: "none", notice: "custom_notice", } - - java_library { - name: "myjar", - srcs: ["foo/bar/MyClass.java"], - sdk_version: "none", - system_modules: "none", - compile_dex: true, - static_libs: ["myotherjar"], - } - - java_library { - name: "myotherjar", - srcs: ["foo/bar/MyClass.java"], - sdk_version: "none", - system_modules: "none", - compile_dex: true, - } `) apexRule := ctx.ModuleForTests("myapex", "android_common_myapex").Rule("apexRule") @@ -375,24 +354,17 @@ func TestBasicApex(t *testing.T) { // Ensure that apex variant is created for the direct dep ensureListContains(t, ctx.ModuleVariantsForTests("mylib"), "android_arm64_armv8-a_core_shared_myapex") - ensureListContains(t, ctx.ModuleVariantsForTests("myjar"), "android_common_myapex") // Ensure that apex variant is created for the indirect dep ensureListContains(t, ctx.ModuleVariantsForTests("mylib2"), "android_arm64_armv8-a_core_shared_myapex") - ensureListContains(t, ctx.ModuleVariantsForTests("myotherjar"), "android_common_myapex") // Ensure that both direct and indirect deps are copied into apex ensureContains(t, copyCmds, "image.apex/lib64/mylib.so") ensureContains(t, copyCmds, "image.apex/lib64/mylib2.so") - ensureContains(t, copyCmds, "image.apex/javalib/myjar.jar") - // .. but not for java libs - ensureNotContains(t, copyCmds, "image.apex/javalib/myotherjar.jar") - // Ensure that the platform variant ends with _core_shared or _common + // Ensure that the platform variant ends with _core_shared ensureListContains(t, ctx.ModuleVariantsForTests("mylib"), "android_arm64_armv8-a_core_shared") ensureListContains(t, ctx.ModuleVariantsForTests("mylib2"), "android_arm64_armv8-a_core_shared") - ensureListContains(t, ctx.ModuleVariantsForTests("myjar"), "android_common") - ensureListContains(t, ctx.ModuleVariantsForTests("myotherjar"), "android_common") // Ensure that all symlinks are present. found_foo_link_64 := false diff --git a/java/androidmk.go b/java/androidmk.go index ad0e171f3..90fdd0f77 100644 --- a/java/androidmk.go +++ b/java/androidmk.go @@ -55,11 +55,6 @@ 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), @@ -146,11 +141,6 @@ 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), @@ -167,11 +157,6 @@ 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), diff --git a/java/hiddenapi_singleton.go b/java/hiddenapi_singleton.go index 8379f5397..c83dda143 100644 --- a/java/hiddenapi_singleton.go +++ b/java/hiddenapi_singleton.go @@ -152,14 +152,6 @@ func stubFlagsRule(ctx android.SingletonContext) { // Collect dex jar paths for modules that had hiddenapi encode called on them. if h, ok := module.(hiddenAPIIntf); ok { if jar := h.bootDexJar(); jar != nil { - // For a java lib included in an APEX, only take the one built for - // the platform variant, and skip the variants for APEXes. - // Otherwise, the hiddenapi tool will complain about duplicated classes - if a, ok := module.(android.ApexModule); ok { - if android.InAnyApex(module.Name()) && !a.IsForPlatform() { - return - } - } bootDexJars = append(bootDexJars, jar) } } diff --git a/java/java.go b/java/java.go index ca6e232be..f3e10bebd 100644 --- a/java/java.go +++ b/java/java.go @@ -267,7 +267,6 @@ func (me *CompilerDeviceProperties) EffectiveOptimizeEnabled() bool { type Module struct { android.ModuleBase android.DefaultableModuleBase - android.ApexModuleBase properties CompilerProperties protoProperties android.ProtoProperties @@ -1582,7 +1581,6 @@ func LibraryFactory() android.Module { &module.Module.protoProperties) InitJavaModule(module, android.HostAndDeviceSupported) - android.InitApexModule(module) return module } @@ -1605,7 +1603,6 @@ func LibraryHostFactory() android.Module { module.Module.properties.Installable = proptools.BoolPtr(true) InitJavaModule(module, android.HostSupported) - android.InitApexModule(module) return module } @@ -1861,7 +1858,6 @@ type ImportProperties struct { type Import struct { android.ModuleBase android.DefaultableModuleBase - android.ApexModuleBase prebuilt android.Prebuilt properties ImportProperties @@ -2018,7 +2014,6 @@ func ImportFactory() android.Module { android.InitPrebuiltModule(module, &module.properties.Jars) InitJavaModule(module, android.HostAndDeviceSupported) - android.InitApexModule(module) return module } @@ -2034,7 +2029,6 @@ func ImportFactoryHost() android.Module { android.InitPrebuiltModule(module, &module.properties.Jars) InitJavaModule(module, android.HostSupported) - android.InitApexModule(module) return module } @@ -2047,7 +2041,6 @@ type DexImportProperties struct { type DexImport struct { android.ModuleBase android.DefaultableModuleBase - android.ApexModuleBase prebuilt android.Prebuilt properties DexImportProperties @@ -2139,7 +2132,6 @@ func DexImportFactory() android.Module { android.InitPrebuiltModule(module, &module.properties.Jars) InitJavaModule(module, android.DeviceSupported) - android.InitApexModule(module) return module } @@ -2149,7 +2141,6 @@ func DexImportFactory() android.Module { type Defaults struct { android.ModuleBase android.DefaultsModuleBase - android.ApexModuleBase } // java_defaults provides a set of properties that can be inherited by other java or android modules. @@ -2208,7 +2199,7 @@ func DefaultsFactory(props ...interface{}) android.Module { ) android.InitDefaultsModule(module) - android.InitApexModule(module) + return module }