Merge "Do not enable coverage for platform/llndk stub libraries"
diff --git a/apex/apex.go b/apex/apex.go
index 7633ad2..3b06a99 100644
--- a/apex/apex.go
+++ b/apex/apex.go
@@ -511,6 +511,14 @@
if cert != "" {
ctx.AddDependency(ctx.Module(), certificateTag, cert)
}
+
+ if String(a.properties.Manifest) != "" {
+ android.ExtractSourceDeps(ctx, a.properties.Manifest)
+ }
+
+ if String(a.properties.AndroidManifest) != "" {
+ android.ExtractSourceDeps(ctx, a.properties.AndroidManifest)
+ }
}
func (a *apexBundle) getCertString(ctx android.BaseContext) string {
@@ -793,7 +801,7 @@
certificate = java.Certificate{pem, key}
}
- manifest := android.PathForModuleSrc(ctx, proptools.StringDefault(a.properties.Manifest, "apex_manifest.json"))
+ manifest := ctx.ExpandSource(proptools.StringDefault(a.properties.Manifest, "apex_manifest.json"), "manifest")
var abis []string
for _, target := range ctx.MultiTargets() {
@@ -890,7 +898,7 @@
}
if a.properties.AndroidManifest != nil {
- androidManifestFile := android.PathForModuleSrc(ctx, proptools.String(a.properties.AndroidManifest))
+ androidManifestFile := ctx.ExpandSource(proptools.String(a.properties.AndroidManifest), "androidManifest")
implicitInputs = append(implicitInputs, androidManifestFile)
optFlags = append(optFlags, "--android_manifest "+androidManifestFile.String())
}
@@ -969,7 +977,7 @@
if a.installable() {
// For flattened APEX, do nothing but make sure that apex_manifest.json file is also copied along
// with other ordinary files.
- manifest := android.PathForModuleSrc(ctx, proptools.StringDefault(a.properties.Manifest, "apex_manifest.json"))
+ manifest := ctx.ExpandSource(proptools.StringDefault(a.properties.Manifest, "apex_manifest.json"), "manifest")
// rename to apex_manifest.json
copiedManifest := android.PathForModuleOut(ctx, "apex_manifest.json")
diff --git a/apex/apex_test.go b/apex/apex_test.go
index 13ddb55..66f0725 100644
--- a/apex/apex_test.go
+++ b/apex/apex_test.go
@@ -53,6 +53,7 @@
ctx.RegisterModuleType("prebuilt_etc", android.ModuleFactoryAdaptor(android.PrebuiltEtcFactory))
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.PreDepsMutators(func(ctx android.RegisterMutatorsContext) {
ctx.BottomUp("image", cc.ImageMutator).Parallel()
ctx.BottomUp("link", cc.LinkageMutator).Parallel()
@@ -143,6 +144,7 @@
"Android.bp": []byte(bp),
"build/target/product/security": nil,
"apex_manifest.json": nil,
+ "AndroidManifest.xml": nil,
"system/sepolicy/apex/myapex-file_contexts": nil,
"system/sepolicy/apex/myapex_keytest-file_contexts": nil,
"system/sepolicy/apex/otherapex-file_contexts": nil,
@@ -214,6 +216,8 @@
ctx := testApex(t, `
apex_defaults {
name: "myapex-defaults",
+ manifest: ":myapex.manifest",
+ androidManifest: ":myapex.androidmanifest",
key: "myapex.key",
native_shared_libs: ["mylib"],
multilib: {
@@ -234,6 +238,16 @@
private_key: "testkey.pem",
}
+ filegroup {
+ name: "myapex.manifest",
+ srcs: ["apex_manifest.json"],
+ }
+
+ filegroup {
+ name: "myapex.androidmanifest",
+ srcs: ["AndroidManifest.xml"],
+ }
+
cc_library {
name: "mylib",
srcs: ["mylib.cpp"],
diff --git a/bpf/bpf.go b/bpf/bpf.go
index 3ef35b7..4b0d510 100644
--- a/bpf/bpf.go
+++ b/bpf/bpf.go
@@ -66,6 +66,7 @@
// The architecture doesn't matter here, but asm/types.h is included by linux/types.h.
"-isystem bionic/libc/kernel/uapi/asm-arm64",
"-isystem bionic/libc/kernel/android/uapi",
+ "-I system/bpf/progs/include",
"-I " + ctx.ModuleDir(),
}
diff --git a/java/aar.go b/java/aar.go
index 60fbe29..583a6fc 100644
--- a/java/aar.go
+++ b/java/aar.go
@@ -215,17 +215,17 @@
compiledOverlay = append(compiledOverlay, transitiveStaticLibs...)
- if a.isLibrary {
- // For a static library we treat all the resources equally with no overlay.
- for _, compiledResDir := range compiledResDirs {
- compiledRes = append(compiledRes, compiledResDir...)
- }
- } else if len(transitiveStaticLibs) > 0 {
+ if len(transitiveStaticLibs) > 0 {
// If we are using static android libraries, every source file becomes an overlay.
// This is to emulate old AAPT behavior which simulated library support.
for _, compiledResDir := range compiledResDirs {
compiledOverlay = append(compiledOverlay, compiledResDir...)
}
+ } else if a.isLibrary {
+ // Otherwise, for a static library we treat all the resources equally with no overlay.
+ for _, compiledResDir := range compiledResDirs {
+ compiledRes = append(compiledRes, compiledResDir...)
+ }
} else if len(compiledResDirs) > 0 {
// Without static libraries, the first directory is our directory, which can then be
// overlaid by the rest.
@@ -278,8 +278,8 @@
}
case staticLibTag:
if exportPackage != nil {
- transitiveStaticLibs = append(transitiveStaticLibs, exportPackage)
transitiveStaticLibs = append(transitiveStaticLibs, aarDep.ExportedStaticPackages()...)
+ transitiveStaticLibs = append(transitiveStaticLibs, exportPackage)
staticLibManifests = append(staticLibManifests, aarDep.ExportedManifest())
staticRRODirs = append(staticRRODirs, aarDep.ExportedRRODirs()...)
}
diff --git a/java/app_test.go b/java/app_test.go
index 103f24b..317c752 100644
--- a/java/app_test.go
+++ b/java/app_test.go
@@ -164,11 +164,12 @@
}
}
-func TestEnforceRRO(t *testing.T) {
+func TestAndroidResources(t *testing.T) {
testCases := []struct {
name string
enforceRROTargets []string
enforceRROExcludedOverlays []string
+ resourceFiles map[string][]string
overlayFiles map[string][]string
rroDirs map[string][]string
}{
@@ -176,17 +177,29 @@
name: "no RRO",
enforceRROTargets: nil,
enforceRROExcludedOverlays: nil,
+ resourceFiles: map[string][]string{
+ "foo": nil,
+ "bar": {"bar/res/res/values/strings.xml"},
+ "lib": nil,
+ "lib2": {"lib2/res/res/values/strings.xml"},
+ },
overlayFiles: map[string][]string{
- "foo": []string{
+ "foo": {
+ buildDir + "/.intermediates/lib2/android_common/package-res.apk",
buildDir + "/.intermediates/lib/android_common/package-res.apk",
"foo/res/res/values/strings.xml",
"device/vendor/blah/static_overlay/foo/res/values/strings.xml",
"device/vendor/blah/overlay/foo/res/values/strings.xml",
},
- "bar": []string{
+ "bar": {
"device/vendor/blah/static_overlay/bar/res/values/strings.xml",
"device/vendor/blah/overlay/bar/res/values/strings.xml",
},
+ "lib": {
+ buildDir + "/.intermediates/lib2/android_common/package-res.apk",
+ "lib/res/res/values/strings.xml",
+ "device/vendor/blah/overlay/lib/res/values/strings.xml",
+ },
},
rroDirs: map[string][]string{
"foo": nil,
@@ -197,25 +210,38 @@
name: "enforce RRO on foo",
enforceRROTargets: []string{"foo"},
enforceRROExcludedOverlays: []string{"device/vendor/blah/static_overlay"},
+ resourceFiles: map[string][]string{
+ "foo": nil,
+ "bar": {"bar/res/res/values/strings.xml"},
+ "lib": nil,
+ "lib2": {"lib2/res/res/values/strings.xml"},
+ },
overlayFiles: map[string][]string{
- "foo": []string{
+ "foo": {
+ buildDir + "/.intermediates/lib2/android_common/package-res.apk",
buildDir + "/.intermediates/lib/android_common/package-res.apk",
"foo/res/res/values/strings.xml",
"device/vendor/blah/static_overlay/foo/res/values/strings.xml",
},
- "bar": []string{
+ "bar": {
"device/vendor/blah/static_overlay/bar/res/values/strings.xml",
"device/vendor/blah/overlay/bar/res/values/strings.xml",
},
+ "lib": {
+ buildDir + "/.intermediates/lib2/android_common/package-res.apk",
+ "lib/res/res/values/strings.xml",
+ "device/vendor/blah/overlay/lib/res/values/strings.xml",
+ },
},
rroDirs: map[string][]string{
- "foo": []string{
+ "foo": {
"device/vendor/blah/overlay/foo/res",
// Enforce RRO on "foo" could imply RRO on static dependencies, but for now it doesn't.
// "device/vendor/blah/overlay/lib/res",
},
"bar": nil,
+ "lib": nil,
},
},
{
@@ -226,20 +252,32 @@
"device/vendor/blah/static_overlay/foo",
"device/vendor/blah/static_overlay/bar/res",
},
+ resourceFiles: map[string][]string{
+ "foo": nil,
+ "bar": {"bar/res/res/values/strings.xml"},
+ "lib": nil,
+ "lib2": {"lib2/res/res/values/strings.xml"},
+ },
overlayFiles: map[string][]string{
- "foo": []string{
+ "foo": {
+ buildDir + "/.intermediates/lib2/android_common/package-res.apk",
buildDir + "/.intermediates/lib/android_common/package-res.apk",
"foo/res/res/values/strings.xml",
"device/vendor/blah/static_overlay/foo/res/values/strings.xml",
},
- "bar": []string{"device/vendor/blah/static_overlay/bar/res/values/strings.xml"},
+ "bar": {"device/vendor/blah/static_overlay/bar/res/values/strings.xml"},
+ "lib": {
+ buildDir + "/.intermediates/lib2/android_common/package-res.apk",
+ "lib/res/res/values/strings.xml",
+ },
},
rroDirs: map[string][]string{
- "foo": []string{
+ "foo": {
"device/vendor/blah/overlay/foo/res",
"device/vendor/blah/overlay/lib/res",
},
- "bar": []string{"device/vendor/blah/overlay/bar/res"},
+ "bar": {"device/vendor/blah/overlay/bar/res"},
+ "lib": {"device/vendor/blah/overlay/lib/res"},
},
},
}
@@ -254,6 +292,7 @@
"foo/res/res/values/strings.xml": nil,
"bar/res/res/values/strings.xml": nil,
"lib/res/res/values/strings.xml": nil,
+ "lib2/res/res/values/strings.xml": nil,
"device/vendor/blah/overlay/foo/res/values/strings.xml": nil,
"device/vendor/blah/overlay/bar/res/values/strings.xml": nil,
"device/vendor/blah/overlay/lib/res/values/strings.xml": nil,
@@ -277,6 +316,12 @@
android_library {
name: "lib",
resource_dirs: ["lib/res"],
+ static_libs: ["lib2"],
+ }
+
+ android_library {
+ name: "lib2",
+ resource_dirs: ["lib2/res"],
}
`
@@ -294,40 +339,52 @@
ctx := testAppContext(config, bp, fs)
run(t, ctx, config)
- getOverlays := func(moduleName string) ([]string, []string) {
- module := ctx.ModuleForTests(moduleName, "android_common")
- overlayFile := module.MaybeOutput("aapt2/overlay.list")
- var overlayFiles []string
- if overlayFile.Rule != nil {
- for _, o := range overlayFile.Inputs.Strings() {
- overlayOutput := module.MaybeOutput(o)
- if overlayOutput.Rule != nil {
- // If the overlay is compiled as part of this module (i.e. a .arsc.flat file),
- // verify the inputs to the .arsc.flat rule.
- overlayFiles = append(overlayFiles, overlayOutput.Inputs.Strings()...)
- } else {
- // Otherwise, verify the full path to the output of the other module
- overlayFiles = append(overlayFiles, o)
- }
+ resourceListToFiles := func(module android.TestingModule, list []string) (files []string) {
+ for _, o := range list {
+ res := module.MaybeOutput(o)
+ if res.Rule != nil {
+ // If the overlay is compiled as part of this module (i.e. a .arsc.flat file),
+ // verify the inputs to the .arsc.flat rule.
+ files = append(files, res.Inputs.Strings()...)
+ } else {
+ // Otherwise, verify the full path to the output of the other module
+ files = append(files, o)
}
}
-
- rroDirs := module.Module().(*AndroidApp).rroDirs.Strings()
-
- return overlayFiles, rroDirs
+ return files
}
- apps := []string{"foo", "bar"}
- for _, app := range apps {
- overlayFiles, rroDirs := getOverlays(app)
-
- if !reflect.DeepEqual(overlayFiles, testCase.overlayFiles[app]) {
- t.Errorf("expected %s overlay files:\n %#v\n got:\n %#v",
- app, testCase.overlayFiles[app], overlayFiles)
+ getResources := func(moduleName string) (resourceFiles, overlayFiles, rroDirs []string) {
+ module := ctx.ModuleForTests(moduleName, "android_common")
+ resourceList := module.MaybeOutput("aapt2/res.list")
+ if resourceList.Rule != nil {
+ resourceFiles = resourceListToFiles(module, resourceList.Inputs.Strings())
}
- if !reflect.DeepEqual(rroDirs, testCase.rroDirs[app]) {
+ overlayList := module.MaybeOutput("aapt2/overlay.list")
+ if overlayList.Rule != nil {
+ overlayFiles = resourceListToFiles(module, overlayList.Inputs.Strings())
+ }
+
+ rroDirs = module.Module().(AndroidLibraryDependency).ExportedRRODirs().Strings()
+
+ return resourceFiles, overlayFiles, rroDirs
+ }
+
+ modules := []string{"foo", "bar", "lib", "lib2"}
+ for _, module := range modules {
+ resourceFiles, overlayFiles, rroDirs := getResources(module)
+
+ if !reflect.DeepEqual(resourceFiles, testCase.resourceFiles[module]) {
+ t.Errorf("expected %s resource files:\n %#v\n got:\n %#v",
+ module, testCase.resourceFiles[module], resourceFiles)
+ }
+ if !reflect.DeepEqual(overlayFiles, testCase.overlayFiles[module]) {
+ t.Errorf("expected %s overlay files:\n %#v\n got:\n %#v",
+ module, testCase.overlayFiles[module], overlayFiles)
+ }
+ if !reflect.DeepEqual(rroDirs, testCase.rroDirs[module]) {
t.Errorf("expected %s rroDirs: %#v\n got:\n %#v",
- app, testCase.rroDirs[app], rroDirs)
+ module, testCase.rroDirs[module], rroDirs)
}
}
})
diff --git a/python/tests/Android.bp b/python/tests/Android.bp
new file mode 100644
index 0000000..1f4305c
--- /dev/null
+++ b/python/tests/Android.bp
@@ -0,0 +1,32 @@
+// Copyright 2019 Google Inc. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+python_test_host {
+ name: "par_test",
+ main: "par_test.py",
+ srcs: [
+ "par_test.py",
+ "testpkg/par_test.py",
+ ],
+
+ version: {
+ py2: {
+ enabled: true,
+ embedded_launcher: true,
+ },
+ py3: {
+ enabled: false,
+ },
+ },
+}
diff --git a/python/tests/par_test.py b/python/tests/par_test.py
new file mode 100644
index 0000000..1fafe0f
--- /dev/null
+++ b/python/tests/par_test.py
@@ -0,0 +1,50 @@
+# Copyright 2019 Google Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import os
+import site
+import sys
+
+# This file checks the visible python state against expected values when run
+# inside a hermetic par file.
+
+failed = False
+def assert_equal(what, a, b):
+ global failed
+ if a != b:
+ print("Expected %s('%s') == '%s'" % (what, a, b))
+ failed = True
+
+assert_equal("__name__", __name__, "__main__")
+assert_equal("os.path.basename(__file__)", os.path.basename(__file__), "par_test.py")
+
+archive = os.path.dirname(__file__)
+
+assert_equal("__package__", __package__, "")
+assert_equal("sys.argv[0]", sys.argv[0], archive)
+assert_equal("sys.executable", sys.executable, None)
+assert_equal("sys.exec_prefix", sys.exec_prefix, archive)
+assert_equal("sys.prefix", sys.prefix, archive)
+assert_equal("__loader__.archive", __loader__.archive, archive)
+assert_equal("site.ENABLE_USER_SITE", site.ENABLE_USER_SITE, None)
+
+assert_equal("len(sys.path)", len(sys.path), 3)
+assert_equal("sys.path[0]", sys.path[0], archive)
+assert_equal("sys.path[1]", sys.path[1], os.path.join(archive, "internal"))
+assert_equal("sys.path[2]", sys.path[2], os.path.join(archive, "internal", "stdlib"))
+
+if failed:
+ sys.exit(1)
+
+import testpkg.par_test
diff --git a/python/tests/runtest.sh b/python/tests/runtest.sh
new file mode 100755
index 0000000..a319558
--- /dev/null
+++ b/python/tests/runtest.sh
@@ -0,0 +1,39 @@
+#!/bin/bash -e
+#
+# Copyright 2019 Google Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+#
+# This is just a helper to run the tests under a few different environments
+#
+
+if [ -z $ANDROID_HOST_OUT ]; then
+ echo "Must be run after running lunch"
+ exit 1
+fi
+
+if [ ! -f $ANDROID_HOST_OUT/nativetest64/par_test/par_test ]; then
+ echo "Run 'm par_test' first"
+ exit 1
+fi
+
+export LD_LIBRARY_PATH=$ANDROID_HOST_OUT/lib64
+
+set -x
+
+PYTHONHOME= PYTHONPATH= $ANDROID_HOST_OUT/nativetest64/par_test/par_test
+PYTHONHOME=/usr $ANDROID_HOST_OUT/nativetest64/par_test/par_test
+PYTHONPATH=/usr $ANDROID_HOST_OUT/nativetest64/par_test/par_test
+
+echo "Passed!"
diff --git a/python/tests/testpkg/par_test.py b/python/tests/testpkg/par_test.py
new file mode 100644
index 0000000..22dd095
--- /dev/null
+++ b/python/tests/testpkg/par_test.py
@@ -0,0 +1,37 @@
+# Copyright 2018 Google Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import os
+import sys
+
+# This file checks the visible python state against expected values when run
+# inside a hermetic par file.
+
+failed = False
+def assert_equal(what, a, b):
+ global failed
+ if a != b:
+ print("Expected %s('%s') == '%s'" % (what, a, b))
+ failed = True
+
+archive = sys.modules["__main__"].__loader__.archive
+
+assert_equal("__name__", __name__, "testpkg.par_test")
+assert_equal("__file__", __file__, os.path.join(archive, "testpkg/par_test.py"))
+assert_equal("__package__", __package__, "testpkg")
+assert_equal("__loader__.archive", __loader__.archive, archive)
+assert_equal("__loader__.prefix", __loader__.prefix, "testpkg/")
+
+if failed:
+ sys.exit(1)