StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Don't add flattened files apex as dependencies of an image apex"

Browse Source 
This reverts commit eb8cd3122a.

Reason for revert: mainline module jacoco jar do not contain JAVA_LIBRARIES needed for coverage, see: b/266679012

Change-Id: If756f7aaf40c6bcfed170c59c494bcc426620039
This commit is contained in:
Diwas Sharma
2023-01-26 18:42:21 +00:00
parent eb8cd3122a
commit bb9202e688
2 changed files with 29 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
apex/androidmk.go
View File

@@ -317,14 +317,14 @@ func (a *apexBundle) writeRequiredModules(w io.Writer, moduleNames []string) {
func (a *apexBundle) androidMkForType() android.AndroidMkData { func (a *apexBundle) androidMkForType() android.AndroidMkData {
return android.AndroidMkData{ return android.AndroidMkData{
Custom: func(w io.Writer, name, prefix, moduleDir string, data android.AndroidMkData) { Custom: func(w io.Writer, name, prefix, moduleDir string, data android.AndroidMkData) {
moduleNames := []string{}
apexType := a.properties.ApexType apexType := a.properties.ApexType
if a.installable() {
apexName := proptools.StringDefault(a.properties.Apex_name, name)
moduleNames = a.androidMkForFiles(w, name, apexName, moduleDir, data)
}
if apexType == flattenedApex { if apexType == flattenedApex {
var moduleNames []string = nil
if a.installable() {
apexName := proptools.StringDefault(a.properties.Apex_name, name)
moduleNames = a.androidMkForFiles(w, name, apexName, moduleDir, data)
}
// Only image APEXes can be flattened. // Only image APEXes can be flattened.
fmt.Fprintln(w, "\ninclude $(CLEAR_VARS) # apex.apexBundle.flat") fmt.Fprintln(w, "\ninclude $(CLEAR_VARS) # apex.apexBundle.flat")
fmt.Fprintln(w, "LOCAL_PATH :=", moduleDir) fmt.Fprintln(w, "LOCAL_PATH :=", moduleDir)
@@ -366,7 +366,7 @@ func (a *apexBundle) androidMkForType() android.AndroidMkData {
} }
android.AndroidMkEmitAssignList(w, "LOCAL_OVERRIDES_MODULES", a.overridableProperties.Overrides) android.AndroidMkEmitAssignList(w, "LOCAL_OVERRIDES_MODULES", a.overridableProperties.Overrides)
a.writeRequiredModules(w, nil) a.writeRequiredModules(w, moduleNames)
fmt.Fprintln(w, "include $(BUILD_PREBUILT)") fmt.Fprintln(w, "include $(BUILD_PREBUILT)")

34
apex/apex_test.go
View File

@@ -526,6 +526,7 @@ func TestBasicApex(t *testing.T) {
data.Custom(&builder, ab.BaseModuleName(), "TARGET_", "", data) data.Custom(&builder, ab.BaseModuleName(), "TARGET_", "", data)
androidMk := builder.String() androidMk := builder.String()
ensureContains(t, androidMk, "LOCAL_MODULE := mylib.myapex\n")
ensureNotContains(t, androidMk, "LOCAL_MODULE := mylib.com.android.myapex\n") ensureNotContains(t, androidMk, "LOCAL_MODULE := mylib.com.android.myapex\n")
optFlags := apexRule.Args["opt_flags"] optFlags := apexRule.Args["opt_flags"]
@@ -2995,7 +2996,7 @@ func TestAndroidMk_VendorApexRequired(t *testing.T) {
var builder strings.Builder var builder strings.Builder
data.Custom(&builder, name, prefix, "", data) data.Custom(&builder, name, prefix, "", data)
androidMk := builder.String() androidMk := builder.String()
ensureContains(t, androidMk, "LOCAL_REQUIRED_MODULES := libc.vendor libm.vendor libdl.vendor\n") ensureContains(t, androidMk, "LOCAL_REQUIRED_MODULES := libc++.vendor.myapex:64 mylib.vendor.myapex:64 apex_manifest.pb.myapex apex_pubkey.myapex libc.vendor libm.vendor libdl.vendor\n")
} }
func TestAndroidMkWritesCommonProperties(t *testing.T) { func TestAndroidMkWritesCommonProperties(t *testing.T) {
@@ -4152,6 +4153,7 @@ func TestApexName(t *testing.T) {
var builder strings.Builder var builder strings.Builder
data.Custom(&builder, name, prefix, "", data) data.Custom(&builder, name, prefix, "", data)
androidMk := builder.String() androidMk := builder.String()
ensureContains(t, androidMk, "LOCAL_MODULE := mylib.myapex\n")
ensureNotContains(t, androidMk, "LOCAL_MODULE := mylib.com.android.myapex\n") ensureNotContains(t, androidMk, "LOCAL_MODULE := mylib.com.android.myapex\n")
} }
@@ -5685,6 +5687,12 @@ func TestApexWithTests(t *testing.T) {
var builder strings.Builder var builder strings.Builder
data.Custom(&builder, name, prefix, "", data) data.Custom(&builder, name, prefix, "", data)
androidMk := builder.String() androidMk := builder.String()
ensureContains(t, androidMk, "LOCAL_MODULE := mytest.myapex\n")
ensureContains(t, androidMk, "LOCAL_MODULE := mytest1.myapex\n")
ensureContains(t, androidMk, "LOCAL_MODULE := mytest2.myapex\n")
ensureContains(t, androidMk, "LOCAL_MODULE := mytest3.myapex\n")
ensureContains(t, androidMk, "LOCAL_MODULE := apex_manifest.pb.myapex\n")
ensureContains(t, androidMk, "LOCAL_MODULE := apex_pubkey.myapex\n")
ensureContains(t, androidMk, "LOCAL_MODULE := myapex\n") ensureContains(t, androidMk, "LOCAL_MODULE := myapex\n")
flatBundle := ctx.ModuleForTests("myapex", "android_common_myapex_flattened").Module().(*apexBundle) flatBundle := ctx.ModuleForTests("myapex", "android_common_myapex_flattened").Module().(*apexBundle)
@@ -5718,7 +5726,7 @@ func TestInstallExtraFlattenedApexes(t *testing.T) {
var builder strings.Builder var builder strings.Builder
mk.Custom(&builder, ab.Name(), "TARGET_", "", mk) mk.Custom(&builder, ab.Name(), "TARGET_", "", mk)
androidMk := builder.String() androidMk := builder.String()
ensureContains(t, androidMk, "LOCAL_REQUIRED_MODULES := myapex.flattened\n") ensureContains(t, androidMk, "LOCAL_REQUIRED_MODULES := apex_manifest.pb.myapex apex_pubkey.myapex myapex.flattened\n")
} }
func TestErrorsIfDepsAreNotEnabled(t *testing.T) { func TestErrorsIfDepsAreNotEnabled(t *testing.T) {
@@ -6511,6 +6519,12 @@ func TestOverrideApex(t *testing.T) {
var builder strings.Builder var builder strings.Builder
data.Custom(&builder, name, "TARGET_", "", data) data.Custom(&builder, name, "TARGET_", "", data)
androidMk := builder.String() androidMk := builder.String()
ensureContains(t, androidMk, "LOCAL_MODULE := override_app.override_myapex")
ensureContains(t, androidMk, "LOCAL_MODULE := overrideBpf.o.override_myapex")
ensureContains(t, androidMk, "LOCAL_MODULE := apex_manifest.pb.override_myapex")
ensureContains(t, androidMk, "LOCAL_MODULE := override_bcplib.override_myapex")
ensureContains(t, androidMk, "LOCAL_MODULE := override_systemserverlib.override_myapex")
ensureContains(t, androidMk, "LOCAL_MODULE := override_java_library.override_myapex")
ensureContains(t, androidMk, "LOCAL_MODULE_STEM := override_myapex.apex") ensureContains(t, androidMk, "LOCAL_MODULE_STEM := override_myapex.apex")
ensureContains(t, androidMk, "LOCAL_OVERRIDES_MODULES := unknownapex myapex") ensureContains(t, androidMk, "LOCAL_OVERRIDES_MODULES := unknownapex myapex")
ensureNotContains(t, androidMk, "LOCAL_MODULE := app.myapex") ensureNotContains(t, androidMk, "LOCAL_MODULE := app.myapex")
@@ -7102,7 +7116,7 @@ func TestCarryRequiredModuleNames(t *testing.T) {
var builder strings.Builder var builder strings.Builder
data.Custom(&builder, name, prefix, "", data) data.Custom(&builder, name, prefix, "", data)
androidMk := builder.String() androidMk := builder.String()
ensureContains(t, androidMk, "LOCAL_REQUIRED_MODULES := a b\n") ensureContains(t, androidMk, "LOCAL_REQUIRED_MODULES := mylib.myapex:64 apex_manifest.pb.myapex apex_pubkey.myapex a b\n")
ensureContains(t, androidMk, "LOCAL_HOST_REQUIRED_MODULES := c d\n") ensureContains(t, androidMk, "LOCAL_HOST_REQUIRED_MODULES := c d\n")
ensureContains(t, androidMk, "LOCAL_TARGET_REQUIRED_MODULES := e f\n") ensureContains(t, androidMk, "LOCAL_TARGET_REQUIRED_MODULES := e f\n")
} }
@@ -7273,9 +7287,6 @@ func TestSymlinksFromApexToSystemRequiredModuleNames(t *testing.T) {
"myapex", "myapex",
"//apex_available:platform", "//apex_available:platform",
], ],
stubs: {
versions: ["current"],
},
} }
`) `)
@@ -7285,10 +7296,11 @@ func TestSymlinksFromApexToSystemRequiredModuleNames(t *testing.T) {
data.Custom(&builder, apexBundle.BaseModuleName(), "TARGET_", "", data) data.Custom(&builder, apexBundle.BaseModuleName(), "TARGET_", "", data)
androidMk := builder.String() androidMk := builder.String()
// `myotherlib` is added to `myapex` as symlink // `myotherlib` is added to `myapex` as symlink
ensureContains(t, androidMk, "LOCAL_MODULE := mylib.myapex\n")
ensureNotContains(t, androidMk, "LOCAL_MODULE := prebuilt_myotherlib.myapex\n") ensureNotContains(t, androidMk, "LOCAL_MODULE := prebuilt_myotherlib.myapex\n")
ensureNotContains(t, androidMk, "LOCAL_MODULE := myotherlib.myapex\n") ensureNotContains(t, androidMk, "LOCAL_MODULE := myotherlib.myapex\n")
// `myapex` should have `myotherlib` in its required line, not `prebuilt_myotherlib` // `myapex` should have `myotherlib` in its required line, not `prebuilt_myotherlib`
ensureContains(t, androidMk, "LOCAL_REQUIRED_MODULES := myotherlib\n") ensureContains(t, androidMk, "LOCAL_REQUIRED_MODULES := mylib.myapex:64 myotherlib:64 apex_manifest.pb.myapex apex_pubkey.myapex\n")
} }
func TestApexWithJniLibs(t *testing.T) { func TestApexWithJniLibs(t *testing.T) {
@@ -8801,7 +8813,7 @@ func TestPreferredPrebuiltSharedLibDep(t *testing.T) {
// The make level dependency needs to be on otherlib - prebuilt_otherlib isn't // The make level dependency needs to be on otherlib - prebuilt_otherlib isn't
// a thing there. // a thing there.
ensureContains(t, androidMk, "LOCAL_REQUIRED_MODULES := otherlib\n") ensureContains(t, androidMk, "LOCAL_REQUIRED_MODULES := libc++:64 mylib.myapex:64 apex_manifest.pb.myapex apex_pubkey.myapex otherlib\n")
} }
func TestExcludeDependency(t *testing.T) { func TestExcludeDependency(t *testing.T) {
@@ -9195,7 +9207,7 @@ func TestAndroidMk_DexpreoptBuiltInstalledForApex(t *testing.T) {
var builder strings.Builder var builder strings.Builder
data.Custom(&builder, apexBundle.BaseModuleName(), "TARGET_", "", data) data.Custom(&builder, apexBundle.BaseModuleName(), "TARGET_", "", data)
androidMk := builder.String() androidMk := builder.String()
ensureContains(t, androidMk, "LOCAL_REQUIRED_MODULES := foo-dexpreopt-arm64-apex@myapex@javalib@foo.jar@classes.odex foo-dexpreopt-arm64-apex@myapex@javalib@foo.jar@classes.vdex\n") ensureContains(t, androidMk, "LOCAL_REQUIRED_MODULES := foo.myapex apex_manifest.pb.myapex apex_pubkey.myapex foo-dexpreopt-arm64-apex@myapex@javalib@foo.jar@classes.odex foo-dexpreopt-arm64-apex@myapex@javalib@foo.jar@classes.vdex\n")
} }
func TestAndroidMk_DexpreoptBuiltInstalledForApex_Prebuilt(t *testing.T) { func TestAndroidMk_DexpreoptBuiltInstalledForApex_Prebuilt(t *testing.T) {
@@ -9271,7 +9283,7 @@ func TestAndroidMk_RequiredModules(t *testing.T) {
var builder strings.Builder var builder strings.Builder
data.Custom(&builder, apexBundle.BaseModuleName(), "TARGET_", "", data) data.Custom(&builder, apexBundle.BaseModuleName(), "TARGET_", "", data)
androidMk := builder.String() androidMk := builder.String()
ensureContains(t, androidMk, "LOCAL_REQUIRED_MODULES := otherapex") ensureContains(t, androidMk, "LOCAL_REQUIRED_MODULES := foo.myapex apex_manifest.pb.myapex apex_pubkey.myapex otherapex")
} }
func TestAndroidMk_RequiredDeps(t *testing.T) { func TestAndroidMk_RequiredDeps(t *testing.T) {
@@ -9295,7 +9307,7 @@ func TestAndroidMk_RequiredDeps(t *testing.T) {
var builder strings.Builder var builder strings.Builder
data.Custom(&builder, bundle.BaseModuleName(), "TARGET_", "", data) data.Custom(&builder, bundle.BaseModuleName(), "TARGET_", "", data)
androidMk := builder.String() androidMk := builder.String()
ensureContains(t, androidMk, "LOCAL_REQUIRED_MODULES := foo\n") ensureContains(t, androidMk, "LOCAL_REQUIRED_MODULES := apex_manifest.pb.myapex apex_pubkey.myapex foo\n")
flattenedBundle := ctx.ModuleForTests("myapex", "android_common_myapex_flattened").Module().(*apexBundle) flattenedBundle := ctx.ModuleForTests("myapex", "android_common_myapex_flattened").Module().(*apexBundle)
flattenedBundle.requiredDeps = append(flattenedBundle.requiredDeps, "foo") flattenedBundle.requiredDeps = append(flattenedBundle.requiredDeps, "foo")