Merge "Add an allowlist for modules that have broken optional_uses_libs."
diff --git a/core/board_config.mk b/core/board_config.mk
index c8ec5a9..f459d83 100644
--- a/core/board_config.mk
+++ b/core/board_config.mk
@@ -1000,6 +1000,14 @@
TARGET_FLATTEN_APEX := $(OVERRIDE_TARGET_FLATTEN_APEX)
endif
+# TODO(b/278826656) Remove the following message
+ifeq (true,$(TARGET_FLATTEN_APEX))
+ $(warning ********************************************************************************)
+ $(warning Flattened APEX will be deprecated soon. Please stop using flattened APEX and use)
+ $(warning "image" APEX instead.)
+ $(warning ********************************************************************************)
+endif
+
ifeq (,$(TARGET_BUILD_UNBUNDLED))
ifdef PRODUCT_EXTRA_VNDK_VERSIONS
$(foreach v,$(PRODUCT_EXTRA_VNDK_VERSIONS),$(call check_vndk_version,$(v)))
diff --git a/tools/releasetools/img_from_target_files.py b/tools/releasetools/img_from_target_files.py
index 17f4cc5..fa53ad2 100755
--- a/tools/releasetools/img_from_target_files.py
+++ b/tools/releasetools/img_from_target_files.py
@@ -64,7 +64,7 @@
OPTIONS.retrofit_dap = None
OPTIONS.build_super = None
OPTIONS.sparse_userimages = None
-
+OPTIONS.use_fastboot_info = False
def LoadOptions(input_file):
"""Loads information from input_file to OPTIONS.
@@ -118,8 +118,9 @@
entries = [
'OTA/android-info.txt:android-info.txt',
- 'META/fastboot-info.txt:fastboot-info.txt',
]
+ if OPTIONS.use_fastboot_info:
+ entries.append('META/fastboot-info.txt:fastboot-info.txt')
with zipfile.ZipFile(input_file) as input_zip:
namelist = input_zip.namelist()
if 'PREBUILT_IMAGES/kernel_16k' in namelist: