summaryrefslogtreecommitdiff
path: root/scripts/Android.bp
diff options
context:
space:
mode:
author Inseob Kim <inseob@google.com> 2024-06-18 03:57:41 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2024-06-18 03:57:41 +0000
commit25cdff6815b51cf78ca433bccd5ba3165d26d41b (patch)
treea7be1236ff92d19fdcd827acbebe42c8b2d7b028 /scripts/Android.bp
parentd6352efd1a0349a7e58ea48787009e59406ac8a8 (diff)
parent1d9148244f1a301377251aaacf3e5375661e3158 (diff)
Merge changes from topic "product_config_module" into main
* changes: Use product_config from buildinfo_prop module Add product_config module
Diffstat (limited to 'scripts/Android.bp')
-rw-r--r--scripts/Android.bp8
1 files changed, 8 insertions, 0 deletions
diff --git a/scripts/Android.bp b/scripts/Android.bp
index 80cd93579..57766edba 100644
--- a/scripts/Android.bp
+++ b/scripts/Android.bp
@@ -292,6 +292,14 @@ python_binary_host {
}
python_binary_host {
+ name: "merge_json",
+ main: "merge_json.py",
+ srcs: [
+ "merge_json.py",
+ ],
+}
+
+python_binary_host {
name: "buildinfo",
main: "buildinfo.py",
srcs: ["buildinfo.py"],