aboutsummaryrefslogtreecommitdiff
path: root/examples/apex
diff options
context:
space:
mode:
authorRupert Shuttleworth <ruperts@google.com>2021-07-27 01:35:42 -0400
committerRupert Shuttleworth <ruperts@google.com>2021-07-27 05:02:29 -0400
commitca41c1d346ba85db3c8364d58b7f768691010eb5 (patch)
tree50606aa899d7e7703c852cde67aacf84faa9a36a /examples/apex
parent7501998520897defec59ab8f5dd86f8417807b4e (diff)
downloadbazel-ca41c1d346ba85db3c8364d58b7f768691010eb5.tar.gz
Add some more attributes to the APEX macro/rule.
Test: TH Change-Id: Ife82cb85c41c76fdb242ee6320701cbb259be007
Diffstat (limited to 'examples/apex')
-rw-r--r--examples/apex/minimal/Android.bp18
-rw-r--r--examples/apex/minimal/file_contexts7
2 files changed, 17 insertions, 8 deletions
diff --git a/examples/apex/minimal/Android.bp b/examples/apex/minimal/Android.bp
index 3419d71d..fb2a28ca 100644
--- a/examples/apex/minimal/Android.bp
+++ b/examples/apex/minimal/Android.bp
@@ -29,15 +29,21 @@ android_app_certificate {
certificate: "build.bazel.examples.apex.minimal",
}
+filegroup {
+ name: "build.bazel.examples.apex.minimal-file_contexts",
+ srcs: [
+ "file_contexts",
+ ],
+}
+
apex {
name: "build.bazel.examples.apex.minimal",
manifest: "manifest.json",
- // We should make a file_contexts specific for this apex, but the apex
- // build requires file_contexts files to be under //system/sepolicy.
- // See https://cs.android.com/android/platform/superproject/+/master:build/soong/apex/builder.go;l=265-267;drc=9d9960f2404afa76c6445f72e8a326c2b789c6bc
- //
- // More info: https://android.googlesource.com/platform/system/apex/+/master/docs/howto.md#building-an-apex
- file_contexts: ":apex.test-file_contexts",
+ file_contexts: ":build.bazel.examples.apex.minimal-file_contexts",
+
+ // So that we aren't considered a "platform APEX" and can use a file_context that lives outside of system/sepolicy/apex
+ product_specific: true,
+
key: "build.bazel.examples.apex.minimal.key",
min_sdk_version: "30",
}
diff --git a/examples/apex/minimal/file_contexts b/examples/apex/minimal/file_contexts
index 6072759f..3619cc83 100644
--- a/examples/apex/minimal/file_contexts
+++ b/examples/apex/minimal/file_contexts
@@ -1,2 +1,5 @@
-(/.*)? u:object_r:system_file:s0
-/lib(64)?(/.*)? u:object_r:system_lib_file:s0
+/bin/apex_test_preInstallHook u:object_r:apex_test_prepostinstall_exec:s0
+/bin/apex_test_postInstallHook u:object_r:apex_test_prepostinstall_exec:s0
+/bin/surfaceflinger u:object_r:surfaceflinger_exec:s0
+/lib(64)?(/.*)? u:object_r:system_lib_file:s0
+(/.*)? u:object_r:system_file:s0