commit f64e2f84330dd61250168206ff3dfdeb755efa49
author Zhuoyao Zhang <zhuoyao@google.com> Thu Oct 24 16:33:38 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Oct 24 16:33:38 2024 +0000
tree 747eb3f00842ab80c354a7f1cff859f2d8f06319
parent 88c5309cbbeacadb441d756fb17735d88b7ba066
parent 0597a9d7757e3753a1508981d2310e9ac92c3c43

Merge "Filter out the logs from inotify_buffer in edit monitor" into main

core/soong_config.mk

diff --git a/core/soong_config.mk b/core/soong_config.mk
index 01e4697..a511d5c 100644
--- a/core/soong_config.mk
+++ b/core/soong_config.mk
@@ -426,6 +426,11 @@
   $(call add_json_list, ProductPackages, $(PRODUCT_PACKAGES))
   $(call add_json_list, ProductPackagesDebug, $(PRODUCT_PACKAGES_DEBUG))
 
+  $(call add_json_map, ProductCopyFiles)
+  $(foreach pair,$(PRODUCT_COPY_FILES),\
+    $(call add_json_str,$(word 1,$(subst :, ,$(pair))),$(word 2,$(subst :, ,$(pair)))))
+  $(call end_json_map)
+
 $(call end_json_map)
 
 $(call json_end)

tools/releasetools/Android.bp

diff --git a/tools/releasetools/Android.bp b/tools/releasetools/Android.bp
index 8c71044..e371b23 100644
--- a/tools/releasetools/Android.bp
+++ b/tools/releasetools/Android.bp
@@ -637,6 +637,8 @@
     ],
     data: [
         "testdata/**/*",
+    ],
+    device_common_data: [
         ":com.android.apex.compressed.v1",
         ":com.android.apex.vendor.foo.with_vintf",
     ],