Merge "Fix apex_available" into rvc-dev
diff --git a/apex/apex.go b/apex/apex.go
index ee6f93a..268088b 100644
--- a/apex/apex.go
+++ b/apex/apex.go
@@ -212,8 +212,11 @@
"bluetooth-protos-lite",
"bluetooth.mapsapi",
"com.android.vcard",
+ "dnsresolver_aidl_interface-V2-java",
"fmtlib",
"guava",
+ "ipmemorystore-aidl-interfaces-V5-java",
+ "ipmemorystore-aidl-interfaces-java",
"internal_include_headers",
"lib-bt-packets",
"lib-bt-packets-avrcp",
@@ -279,6 +282,12 @@
"libutils_headers",
"libz",
"media_plugin_headers",
+ "net-utils-services-common",
+ "netd_aidl_interface-unstable-java",
+ "netd_event_listener_interface-java",
+ "netlink-client",
+ "networkstack-aidl-interfaces-unstable-java",
+ "networkstack-client",
"sap-api-java-static",
"services.net",
}
@@ -296,6 +305,7 @@
"libcrypto",
"libnativehelper_header_only",
"libssl",
+ "unsupportedappusage",
}
//
// Module separator
@@ -319,6 +329,7 @@
"cronet_impl_platform_java",
"libcronet.80.0.3986.0",
"org.chromium.net.cronet",
+ "org.chromium.net.cronet.xml",
"prebuilt_libcronet.80.0.3986.0",
}
//
@@ -559,6 +570,7 @@
"libFLAC-config",
"libFLAC-headers",
"libFraunhoferAAC",
+ "libLibGuiProperties",
"libarect",
"libasync_safe",
"libaudio_system_headers",
@@ -574,6 +586,7 @@
"libbase",
"libbase_headers",
"libbinder_headers",
+ "libbinderthreadstateutils",
"libbluetooth-types-header",
"libbufferhub_headers",
"libc++",
@@ -779,6 +792,7 @@
"libdexfile_external_headers",
"libdexfile_support",
"libdexfile_support_static",
+ "libdl_static",
"libgtest_prod",
"libjemalloc5",
"liblinker_main",
@@ -870,6 +884,7 @@
m["com.android.wifi"] = []string{
"PlatformProperties",
"android.hardware.wifi-V1.0-java",
+ "android.hardware.wifi-V1.0-java-constants",
"android.hardware.wifi-V1.1-java",
"android.hardware.wifi-V1.2-java",
"android.hardware.wifi-V1.3-java",
@@ -890,6 +905,8 @@
"bouncycastle-unbundled",
"dnsresolver_aidl_interface-V2-java",
"error_prone_annotations",
+ "framework-wifi-pre-jarjar",
+ "framework-wifi-util-lib",
"ipmemorystore-aidl-interfaces-V3-java",
"ipmemorystore-aidl-interfaces-java",
"ksoap2",
@@ -1025,7 +1042,10 @@
var apexBundles []android.ApexInfo
var directDep bool
if a, ok := mctx.Module().(*apexBundle); ok && !a.vndkApex {
- apexBundles = []android.ApexInfo{{mctx.ModuleName(), proptools.Bool(a.properties.Legacy_android10_support)}}
+ apexBundles = []android.ApexInfo{android.ApexInfo{
+ ApexName: mctx.ModuleName(),
+ LegacyAndroid10Support: proptools.Bool(a.properties.Legacy_android10_support),
+ }}
directDep = true
} else if am, ok := mctx.Module().(android.ApexModule); ok {
apexBundles = am.ApexVariations()
@@ -1036,10 +1056,14 @@
return
}
+ cur := mctx.Module().(interface {
+ DepIsInSameApex(android.BaseModuleContext, android.Module) bool
+ })
+
mctx.VisitDirectDeps(func(child android.Module) {
depName := mctx.OtherModuleName(child)
if am, ok := child.(android.ApexModule); ok && am.CanHaveApexVariants() &&
- (directDep || am.DepIsInSameApex(mctx, child)) {
+ cur.DepIsInSameApex(mctx, child) {
android.UpdateApexDependency(apexBundles, depName, directDep)
am.BuildForApexes(apexBundles)
}
@@ -1958,7 +1982,7 @@
}
// Check for the indirect dependencies if it is considered as part of the APEX
- if am.DepIsInSameApex(ctx, am) {
+ if am.ApexName() != "" {
do(ctx, parent, am, false /* externalDep */)
return true
}
@@ -1979,10 +2003,12 @@
a.walkPayloadDeps(ctx, func(ctx android.ModuleContext, from blueprint.Module, to android.ApexModule, externalDep bool) {
apexName := ctx.ModuleName()
- if externalDep || to.AvailableFor(apexName) || whitelistedApexAvailable(apexName, to) {
+ fromName := ctx.OtherModuleName(from)
+ toName := ctx.OtherModuleName(to)
+ if externalDep || to.AvailableFor(apexName) || whitelistedApexAvailable(apexName, toName) {
return
}
- ctx.ModuleErrorf("%q requires %q that is not available for the APEX.", from.Name(), to.Name())
+ ctx.ModuleErrorf("%q requires %q that is not available for the APEX.", fromName, toName)
})
}
@@ -2352,13 +2378,12 @@
a.buildApexDependencyInfo(ctx)
}
-func whitelistedApexAvailable(apex string, module android.Module) bool {
+func whitelistedApexAvailable(apex, moduleName string) bool {
key := apex
key = strings.Replace(key, "test_", "", 1)
key = strings.Replace(key, "com.android.art.debug", "com.android.art", 1)
key = strings.Replace(key, "com.android.art.release", "com.android.art", 1)
- moduleName := module.Name()
// Prebuilt modules (e.g. java_import, etc.) have "prebuilt_" prefix added by the build
// system. Trim the prefix for the check since they are confusing
moduleName = strings.TrimPrefix(moduleName, "prebuilt_")
diff --git a/apex/apex_test.go b/apex/apex_test.go
index 6a9533e..34736e5 100644
--- a/apex/apex_test.go
+++ b/apex/apex_test.go
@@ -2832,6 +2832,7 @@
stl: "none",
system_shared_libs: [],
enabled: false,
+ apex_available: ["myapex"],
}
`)
testApexError(t, `module "myapex" .* depends on disabled module "myjar"`, `
@@ -2853,6 +2854,7 @@
sdk_version: "none",
system_modules: "none",
enabled: false,
+ apex_available: ["myapex"],
}
`)
}
@@ -3011,7 +3013,7 @@
func TestApexPropertiesShouldBeDefaultable(t *testing.T) {
// libfoo's apex_available comes from cc_defaults
- testApexError(t, `"myapex" .*: "myapex" requires "libfoo" that is not available for the APEX`, `
+ testApexError(t, `requires "libfoo" that is not available for the APEX`, `
apex {
name: "myapex",
key: "myapex.key",
@@ -3077,8 +3079,8 @@
apex_available: ["otherapex"],
}`)
- // libbar is an indirect dep
- testApexError(t, "requires \"libbar\" that is not available for the APEX", `
+ // libbbaz is an indirect dep
+ testApexError(t, "requires \"libbaz\" that is not available for the APEX", `
apex {
name: "myapex",
key: "myapex.key",
@@ -3091,31 +3093,26 @@
private_key: "testkey.pem",
}
- apex {
- name: "otherapex",
- key: "otherapex.key",
- native_shared_libs: ["libfoo"],
- }
-
- apex_key {
- name: "otherapex.key",
- public_key: "testkey.avbpubkey",
- private_key: "testkey.pem",
- }
-
cc_library {
name: "libfoo",
stl: "none",
shared_libs: ["libbar"],
system_shared_libs: [],
- apex_available: ["myapex", "otherapex"],
+ apex_available: ["myapex"],
}
cc_library {
name: "libbar",
stl: "none",
+ shared_libs: ["libbaz"],
system_shared_libs: [],
- apex_available: ["otherapex"],
+ apex_available: ["myapex"],
+ }
+
+ cc_library {
+ name: "libbaz",
+ stl: "none",
+ system_shared_libs: [],
}`)
testApexError(t, "\"otherapex\" is not a valid module name", `
@@ -3452,6 +3449,7 @@
sdk_version: "none",
system_modules: "none",
compile_dex: false,
+ apex_available: ["myapex"],
}
`)
}
diff --git a/java/java.go b/java/java.go
index 8d58a90..23dc0b5 100644
--- a/java/java.go
+++ b/java/java.go
@@ -1790,11 +1790,16 @@
}
func (j *Module) DepIsInSameApex(ctx android.BaseModuleContext, dep android.Module) bool {
- depTag := ctx.OtherModuleDependencyTag(dep)
// Dependencies other than the static linkage are all considered crossing APEX boundary
+ if staticLibTag == ctx.OtherModuleDependencyTag(dep) {
+ return true
+ }
// Also, a dependency to an sdk member is also considered as such. This is required because
// sdk members should be mutated into APEXes. Refer to sdk.sdkDepsReplaceMutator.
- return depTag == staticLibTag || j.IsInAnySdk()
+ if sa, ok := dep.(android.SdkAware); ok && sa.IsInAnySdk() {
+ return true
+ }
+ return false
}
func (j *Module) Stem() string {
@@ -2495,11 +2500,16 @@
}
func (j *Import) DepIsInSameApex(ctx android.BaseModuleContext, dep android.Module) bool {
- depTag := ctx.OtherModuleDependencyTag(dep)
// dependencies other than the static linkage are all considered crossing APEX boundary
+ if staticLibTag == ctx.OtherModuleDependencyTag(dep) {
+ return true
+ }
// Also, a dependency to an sdk member is also considered as such. This is required because
// sdk members should be mutated into APEXes. Refer to sdk.sdkDepsReplaceMutator.
- return depTag == staticLibTag || j.IsInAnySdk()
+ if sa, ok := dep.(android.SdkAware); ok && sa.IsInAnySdk() {
+ return true
+ }
+ return false
}
// Add compile time check for interface implementation
diff --git a/java/sdk_library.go b/java/sdk_library.go
index a8edf1d..6921114 100644
--- a/java/sdk_library.go
+++ b/java/sdk_library.go
@@ -581,6 +581,14 @@
mctx.CreateModule(DroidstubsFactory, &props)
}
+func (module *SdkLibrary) DepIsInSameApex(mctx android.BaseModuleContext, dep android.Module) bool {
+ depTag := mctx.OtherModuleDependencyTag(dep)
+ if depTag == xmlPermissionsFileTag {
+ return true
+ }
+ return module.Library.DepIsInSameApex(mctx, dep)
+}
+
// Creates the xml file that publicizes the runtime library
func (module *SdkLibrary) createXmlFile(mctx android.LoadHookContext) {
props := struct {
@@ -590,9 +598,11 @@
Device_specific *bool
Product_specific *bool
System_ext_specific *bool
+ Apex_available []string
}{
- Name: proptools.StringPtr(module.xmlFileName()),
- Lib_name: proptools.StringPtr(module.BaseModuleName()),
+ Name: proptools.StringPtr(module.xmlFileName()),
+ Lib_name: proptools.StringPtr(module.BaseModuleName()),
+ Apex_available: module.ApexProperties.Apex_available,
}
if module.SocSpecific() {
diff --git a/sdk/sdk_test.go b/sdk/sdk_test.go
index 934bdae..53c2971 100644
--- a/sdk/sdk_test.go
+++ b/sdk/sdk_test.go
@@ -58,6 +58,7 @@
sdk_version: "none",
compile_dex: true,
host_supported: true,
+ apex_available: ["myapex"],
}
// this lib is no in mysdk
@@ -113,7 +114,7 @@
java_defaults {
name: "java-defaults",
- visibility: ["//other/bar"],
+ visibility: ["//other/bar"],
}
java_library {