aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2022-10-28 01:27:14 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-10-28 01:27:14 +0000
commit57c1f39451af9e208db7c4d32fb556ee02542f5e (patch)
treefead79e52f2f57a74cb0c289939a46ce66c13e05
parent8141f897da2f9cc386f4c1ab99f1e98444342529 (diff)
parentf41b8fd5d6f637c434dc67b4eff0eaf21b5f4b4f (diff)
downloadlibbcc-57c1f39451af9e208db7c4d32fb556ee02542f5e.tar.gz
Merge "Enable host libbcc even on unbundled builds" am: 9537e74c9f am: f41b8fd5d6
Original change: https://android-review.googlesource.com/c/platform/frameworks/compile/libbcc/+/2268566 Change-Id: I5a458ea30a712fee31aeb01dd6574f74cc58b80d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--lib/Android.bp13
1 files changed, 6 insertions, 7 deletions
diff --git a/lib/Android.bp b/lib/Android.bp
index 7c53f60..6ddc652 100644
--- a/lib/Android.bp
+++ b/lib/Android.bp
@@ -80,13 +80,12 @@ cc_library {
"libdl",
"liblog",
],
- },
- },
-
- product_variables: {
- unbundled_build: {
- // Don't build in unbundled branches
- enabled: false,
+ product_variables: {
+ unbundled_build: {
+ // Don't build in unbundled branches
+ enabled: false,
+ },
+ },
},
},
}