Merge "Add iperf3 to debug packages"
diff --git a/core/Makefile b/core/Makefile
index d4393de..99b86ee 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -4520,7 +4520,6 @@
# For real devices and for dist builds, build super image from target files to an intermediate directory.
INTERNAL_SUPERIMAGE_DIST_TARGET := $(call intermediates-dir-for,PACKAGING,super.img)/super.img
-INTERNAL_SUPERIMAGE_MISC_INFO := $(call intermediates-dir-for,PACKAGING,superimage_debug)/misc_info.txt
$(INTERNAL_SUPERIMAGE_DIST_TARGET): extracted_input_target_files := $(patsubst %.zip,%,$(BUILT_TARGET_FILES_PACKAGE))
$(INTERNAL_SUPERIMAGE_DIST_TARGET): $(LPMAKE) $(BUILT_TARGET_FILES_PACKAGE) $(BUILD_SUPER_IMAGE)
$(call pretty,"Target super fs image from target files: $@")
@@ -4572,13 +4571,15 @@
$(INSTALLED_SUPERIMAGE_TARGET): $(INSTALLED_SUPERIMAGE_DEPENDENCIES)
$(call pretty,"Target super fs image for debug: $@")
$(call build-superimage-target,$(INSTALLED_SUPERIMAGE_TARGET),\
- $(INTERNAL_SUPERIMAGE_MISC_INFO))
+ $(call intermediates-dir-for,PACKAGING,superimage_debug)/misc_info.txt)
droidcore: $(INSTALLED_SUPERIMAGE_TARGET)
# For devices that uses super image directly, the superimage target points to the file in $(PRODUCT_OUT).
.PHONY: superimage
superimage: $(INSTALLED_SUPERIMAGE_TARGET)
+
+$(call dist-for-goals,dist_files,$(INSTALLED_MISC_INFO_TARGET):super_misc_info.txt)
endif # BOARD_BUILD_SUPER_IMAGE_BY_DEFAULT
# Build $(PRODUCT_OUT)/super.img without dependencies.
@@ -4647,15 +4648,13 @@
OTA/super_$(device).img:super_$(device).img)) \
IMAGES/VerifiedBootParams.textproto:VerifiedBootParams.textproto \
OTA/android-info.txt:android-info.txt "IMAGES/*.img:."
- $(if $(INTERNAL_SUPERIMAGE_MISC_INFO), zip -q -j -u $@ $(INTERNAL_SUPERIMAGE_MISC_INFO))
$(if $(INTERNAL_SUPERIMAGE_DIST_TARGET), zip -q -j -u $@ $(INTERNAL_SUPERIMAGE_DIST_TARGET))
else
-$(INTERNAL_UPDATE_PACKAGE_TARGET): $(INSTALLED_MISC_INFO_TARGET)
+$(INTERNAL_UPDATE_PACKAGE_TARGET):
@echo "Package: $@"
$(hide) $(ZIP2ZIP) -i $(BUILT_TARGET_FILES_PACKAGE) -o $@ \
IMAGES/VerifiedBootParams.textproto:VerifiedBootParams.textproto \
OTA/android-info.txt:android-info.txt "IMAGES/*.img:."
- $(if $(INSTALLED_MISC_INFO_TARGET), zip -q -j -u $@ $(INSTALLED_MISC_INFO_TARGET))
endif # BOARD_SUPER_IMAGE_IN_UPDATE_PACKAGE
.PHONY: updatepackage
diff --git a/core/aux_config.mk b/core/aux_config.mk
index a508a2d..86dc10a 100644
--- a/core/aux_config.mk
+++ b/core/aux_config.mk
@@ -149,6 +149,8 @@
variant_sfx :=_aux_variant_config.mk
os_sfx :=_aux_os_config.mk
+ifdef AUX_OS_VARIANT_LIST
+
config_roots := $(wildcard device vendor)
all_configs :=
ifdef config_roots
@@ -180,4 +182,6 @@
)
endif
+endif # AUX_OS_VARIANT_LIST
+
INSTALLED_AUX_TARGETS :=
diff --git a/core/base_rules.mk b/core/base_rules.mk
index e3f8a70..511dda5 100644
--- a/core/base_rules.mk
+++ b/core/base_rules.mk
@@ -748,7 +748,7 @@
## Register with ALL_MODULES
###########################################################
-ifeq ($(filter $(my_register_name),$(ALL_MODULES)),)
+ifndef ALL_MODULES.$(my_register_name).PATH
# These keys are no longer used, they've been replaced by keys that specify
# target/host/host_cross (REQUIRED_FROM_TARGET / REQUIRED_FROM_HOST) and similar.
#
diff --git a/core/cc_prebuilt_internal.mk b/core/cc_prebuilt_internal.mk
index a8930d5..6313019 100644
--- a/core/cc_prebuilt_internal.mk
+++ b/core/cc_prebuilt_internal.mk
@@ -180,15 +180,8 @@
endif
endif
-ifneq ($(filter init%rc,$(notdir $(LOCAL_INSTALLED_MODULE)))$(filter %/etc/init,$(dir $(LOCAL_INSTALLED_MODULE))),)
- $(eval $(call copy-init-script-file-checked,$(my_prebuilt_src_file),$(built_module)))
-else ifneq ($(LOCAL_PREBUILT_STRIP_COMMENTS),)
-$(built_module) : $(my_prebuilt_src_file)
- $(transform-prebuilt-to-target-strip-comments)
-else
$(built_module) : $(my_prebuilt_src_file)
$(transform-prebuilt-to-target)
-endif
ifneq ($(filter EXECUTABLES NATIVE_TESTS,$(LOCAL_MODULE_CLASS)),)
$(hide) chmod +x $@
endif
diff --git a/core/cxx_stl_setup.mk b/core/cxx_stl_setup.mk
index 55c4975..8e4a46c 100644
--- a/core/cxx_stl_setup.mk
+++ b/core/cxx_stl_setup.mk
@@ -55,8 +55,6 @@
my_cxx_ldlibs :=
ifneq ($(filter $(my_cxx_stl),libc++ libc++_static),)
- my_cflags += -D_USING_LIBCXX
-
ifeq ($($(my_prefix)OS),darwin)
# libc++'s headers are annotated with availability macros that indicate
# which version of Mac OS was the first to ship with a libc++ feature
diff --git a/core/envsetup.mk b/core/envsetup.mk
index 8a7aca0..92c5cca 100644
--- a/core/envsetup.mk
+++ b/core/envsetup.mk
@@ -111,9 +111,6 @@
ifneq (,$(findstring Darwin,$(UNAME)))
HOST_OS := darwin
endif
-ifneq (,$(findstring Macintosh,$(UNAME)))
- HOST_OS := darwin
-endif
HOST_OS_EXTRA := $(shell uname -rsm)
ifeq ($(HOST_OS),linux)
diff --git a/core/instrumentation_test_config_template.xml b/core/instrumentation_test_config_template.xml
index afaa561..18ea676 100644
--- a/core/instrumentation_test_config_template.xml
+++ b/core/instrumentation_test_config_template.xml
@@ -22,8 +22,6 @@
<option name="test-file-name" value="{MODULE}.apk" />
</target_preparer>
- {EXTRA_CONFIGS}
-
<test class="com.android.tradefed.testtype.{TEST_TYPE}" >
<option name="package" value="{PACKAGE}" />
<option name="runner" value="{RUNNER}" />
diff --git a/core/misc_prebuilt_internal.mk b/core/misc_prebuilt_internal.mk
index cc2683c..a52b9e5 100644
--- a/core/misc_prebuilt_internal.mk
+++ b/core/misc_prebuilt_internal.mk
@@ -25,7 +25,14 @@
include $(BUILD_SYSTEM)/base_rules.mk
+ifneq ($(filter init%rc,$(notdir $(LOCAL_INSTALLED_MODULE)))$(filter %/etc/init,$(dir $(LOCAL_INSTALLED_MODULE))),)
+ $(eval $(call copy-init-script-file-checked,$(my_prebuilt_src_file),$(LOCAL_BUILT_MODULE)))
+else ifneq ($(LOCAL_PREBUILT_STRIP_COMMENTS),)
+$(LOCAL_BUILT_MODULE) : $(my_prebuilt_src_file)
+ $(transform-prebuilt-to-target-strip-comments)
+else
$(LOCAL_BUILT_MODULE) : $(my_prebuilt_src_file)
$(transform-prebuilt-to-target)
+endif
-built_module := $(LOCAL_BUILT_MODULE)
\ No newline at end of file
+built_module := $(LOCAL_BUILT_MODULE)
diff --git a/target/board/BoardConfigMainlineCommon.mk b/target/board/BoardConfigMainlineCommon.mk
index 70cfe39..ff6defd 100644
--- a/target/board/BoardConfigMainlineCommon.mk
+++ b/target/board/BoardConfigMainlineCommon.mk
@@ -13,6 +13,10 @@
TARGET_COPY_OUT_VENDOR := vendor
TARGET_COPY_OUT_PRODUCT := product
+# Creates metadata partition mount point under root for
+# the devices with metadata parition
+BOARD_USES_METADATA_PARTITION := true
+
BOARD_VNDK_VERSION := current
# Required flag for non-64 bit devices from P.
diff --git a/target/product/gsi/current.txt b/target/product/gsi/current.txt
index d954e9f..4b6c010 100644
--- a/target/product/gsi/current.txt
+++ b/target/product/gsi/current.txt
@@ -151,6 +151,7 @@
VNDK-core: android.hardware.thermal@1.1.so
VNDK-core: android.hardware.tv.cec@1.0.so
VNDK-core: android.hardware.tv.input@1.0.so
+VNDK-core: android.hardware.tv.tuner@1.0.so
VNDK-core: android.hardware.usb.gadget@1.0.so
VNDK-core: android.hardware.usb@1.0.so
VNDK-core: android.hardware.usb@1.1.so
diff --git a/target/product/profile_boot_common.mk b/target/product/profile_boot_common.mk
index fc19954..a40b3e9 100644
--- a/target/product/profile_boot_common.mk
+++ b/target/product/profile_boot_common.mk
@@ -20,29 +20,11 @@
# Ideally we would just generate an empty boot.art but we don't have the build
# support to separate the image from the compile code.
PRODUCT_DEX_PREOPT_BOOT_IMAGE_PROFILE_LOCATION := build/make/target/product/empty-profile
-PRODUCT_DEX_PREOPT_BOOT_FLAGS := --count-hotness-in-compiled-code
DEX_PREOPT_DEFAULT := nostripping
-# Disable uncompressing priv apps so that there is enough space to build the system partition.
-DONT_UNCOMPRESS_PRIV_APPS_DEXS := true
-
-# Use an empty preloaded-classes list.
-PRODUCT_COPY_FILES += \
- build/make/target/product/empty-preloaded-classes:system/etc/preloaded-classes
-
# Boot image property overrides.
PRODUCT_PROPERTY_OVERRIDES += \
- dalvik.vm.jitinitialsize=32m \
- dalvik.vm.jitmaxsize=32m \
- dalvik.vm.usejitprofiles=true \
- dalvik.vm.hot-startup-method-samples=256 \
dalvik.vm.profilesystemserver=true \
- dalvik.vm.profilebootimage=true
-
-# Use speed compiler filter since system server doesn't have JIT.
-PRODUCT_DEX_PREOPT_BOOT_FLAGS += --compiler-filter=speed
-# System server is speed compiled and doesn't have a separate preopt flag,
-# so we enable hotness in compiled code for everything.
-PRODUCT_DEX_PREOPT_DEFAULT_FLAGS := --count-hotness-in-compiled-code
+ dalvik.vm.profilebootclasspath=true
PRODUCT_DIST_BOOT_AND_SYSTEM_JARS := true
diff --git a/tools/releasetools/apex_utils.py b/tools/releasetools/apex_utils.py
index 6eaa12f..18ad8ce 100644
--- a/tools/releasetools/apex_utils.py
+++ b/tools/releasetools/apex_utils.py
@@ -177,6 +177,7 @@
payload_dir = common.MakeTempDir(prefix='apex-payload-')
with zipfile.ZipFile(apex_file) as apex_fd:
payload_file = apex_fd.extract(APEX_PAYLOAD_IMAGE, payload_dir)
+ zip_items = apex_fd.namelist()
payload_info = ParseApexPayloadInfo(avbtool, payload_file)
SignApexPayload(
@@ -192,7 +193,8 @@
payload_public_key = common.ExtractAvbPublicKey(avbtool, payload_key)
common.ZipDelete(apex_file, APEX_PAYLOAD_IMAGE)
- common.ZipDelete(apex_file, APEX_PUBKEY)
+ if APEX_PUBKEY in zip_items:
+ common.ZipDelete(apex_file, APEX_PUBKEY)
apex_zip = zipfile.ZipFile(apex_file, 'a')
common.ZipWrite(apex_zip, payload_file, arcname=APEX_PAYLOAD_IMAGE)
common.ZipWrite(apex_zip, payload_public_key, arcname=APEX_PUBKEY)
diff --git a/tools/releasetools/common.py b/tools/releasetools/common.py
index 2401e46..8339cad 100644
--- a/tools/releasetools/common.py
+++ b/tools/releasetools/common.py
@@ -616,6 +616,10 @@
"""Append signing arguments for avbtool."""
# e.g., "--key path/to/signing_key --algorithm SHA256_RSA4096"
key_path = OPTIONS.info_dict.get("avb_" + partition + "_key_path")
+ if key_path and not os.path.exists(key_path) and OPTIONS.search_path:
+ new_key_path = os.path.join(OPTIONS.search_path, key_path)
+ if os.path.exists(new_key_path):
+ key_path = new_key_path
algorithm = OPTIONS.info_dict.get("avb_" + partition + "_algorithm")
if key_path and algorithm:
cmd.extend(["--key", key_path, "--algorithm", algorithm])
@@ -668,6 +672,10 @@
"""
if key is None:
key = info_dict["avb_" + partition + "_key_path"]
+ if key and not os.path.exists(key) and OPTIONS.search_path:
+ new_key_path = os.path.join(OPTIONS.search_path, key)
+ if os.path.exists(new_key_path):
+ key = new_key_path
pubkey_path = ExtractAvbPublicKey(info_dict["avb_avbtool"], key)
rollback_index_location = info_dict[
"avb_" + partition + "_rollback_index_location"]
diff --git a/tools/releasetools/img_from_target_files.py b/tools/releasetools/img_from_target_files.py
index 4b94ad8..28b1b53 100755
--- a/tools/releasetools/img_from_target_files.py
+++ b/tools/releasetools/img_from_target_files.py
@@ -40,13 +40,21 @@
from build_super_image import BuildSuperImage
if sys.hexversion < 0x02070000:
- print("Python 2.7 or newer is required.", file=sys.stderr)
+ print('Python 2.7 or newer is required.', file=sys.stderr)
sys.exit(1)
logger = logging.getLogger(__name__)
OPTIONS = common.OPTIONS
+OPTIONS.bootable_only = False
+OPTIONS.put_super = None
+OPTIONS.dynamic_partition_list = None
+OPTIONS.super_device_list = None
+OPTIONS.retrofit_dap = None
+OPTIONS.build_super = None
+OPTIONS.sparse_userimages = None
+
def LoadOptions(input_file):
"""Loads information from input_file to OPTIONS.
@@ -56,21 +64,21 @@
"""
info = OPTIONS.info_dict = common.LoadInfoDict(input_file)
- OPTIONS.put_super = info.get("super_image_in_update_package") == "true"
- OPTIONS.dynamic_partition_list = info.get("dynamic_partition_list",
- "").strip().split()
- OPTIONS.super_device_list = info.get("super_block_devices",
- "").strip().split()
- OPTIONS.retrofit_dap = info.get("dynamic_partition_retrofit") == "true"
- OPTIONS.build_super = info.get("build_super_partition") == "true"
- OPTIONS.sparse_userimages = bool(info.get("extfs_sparse_flag"))
+ OPTIONS.put_super = info.get('super_image_in_update_package') == 'true'
+ OPTIONS.dynamic_partition_list = info.get('dynamic_partition_list',
+ '').strip().split()
+ OPTIONS.super_device_list = info.get('super_block_devices',
+ '').strip().split()
+ OPTIONS.retrofit_dap = info.get('dynamic_partition_retrofit') == 'true'
+ OPTIONS.build_super = info.get('build_super_partition') == 'true'
+ OPTIONS.sparse_userimages = bool(info.get('extfs_sparse_flag'))
def CopyInfo(input_tmp, output_zip):
"""Copies the android-info.txt file from the input to the output."""
common.ZipWrite(
- output_zip, os.path.join(input_tmp, "OTA", "android-info.txt"),
- "android-info.txt")
+ output_zip, os.path.join(input_tmp, 'OTA', 'android-info.txt'),
+ 'android-info.txt')
def CopyUserImages(input_tmp, output_zip):
@@ -80,33 +88,33 @@
input_tmp: path to the unzipped input.
output_zip: a ZipFile instance to write images to.
"""
- dynamic_images = [p + ".img" for p in OPTIONS.dynamic_partition_list]
+ dynamic_images = [p + '.img' for p in OPTIONS.dynamic_partition_list]
# Filter out system_other for launch DAP devices because it is in super image.
- if not OPTIONS.retrofit_dap and "system" in OPTIONS.dynamic_partition_list:
- dynamic_images.append("system_other.img")
+ if not OPTIONS.retrofit_dap and 'system' in OPTIONS.dynamic_partition_list:
+ dynamic_images.append('system_other.img')
- images_path = os.path.join(input_tmp, "IMAGES")
+ images_path = os.path.join(input_tmp, 'IMAGES')
# A target-files zip must contain the images since Lollipop.
assert os.path.exists(images_path)
for image in sorted(os.listdir(images_path)):
- if OPTIONS.bootable_only and image not in ("boot.img", "recovery.img"):
+ if OPTIONS.bootable_only and image not in ('boot.img', 'recovery.img'):
continue
- if not image.endswith(".img"):
+ if not image.endswith('.img'):
continue
if OPTIONS.put_super:
- if image == "super_empty.img":
+ if image == 'super_empty.img':
continue
if image in dynamic_images:
continue
- logger.info("writing %s to archive...", os.path.join("IMAGES", image))
+ logger.info('writing %s to archive...', os.path.join('IMAGES', image))
common.ZipWrite(output_zip, os.path.join(images_path, image), image)
def WriteSuperImages(input_tmp, output_zip):
"""Writes super images from the unzipped input into output_zip.
- This is only done if super_image_in_update_package is set to "true".
+ This is only done if super_image_in_update_package is set to 'true'.
- For retrofit dynamic partition devices, copy split super images from target
files package.
@@ -122,21 +130,21 @@
if OPTIONS.retrofit_dap:
# retrofit devices already have split super images under OTA/
- images_path = os.path.join(input_tmp, "OTA")
+ images_path = os.path.join(input_tmp, 'OTA')
for device in OPTIONS.super_device_list:
- image = "super_%s.img" % device
+ image = 'super_%s.img' % device
image_path = os.path.join(images_path, image)
assert os.path.exists(image_path)
- logger.info("writing %s to archive...", os.path.join("OTA", image))
+ logger.info('writing %s to archive...', os.path.join('OTA', image))
common.ZipWrite(output_zip, image_path, image)
else:
# super image for non-retrofit devices aren't in target files package,
# so build it.
- super_file = common.MakeTempFile("super_", ".img")
- logger.info("building super image %s...", super_file)
+ super_file = common.MakeTempFile('super_', '.img')
+ logger.info('building super image %s...', super_file)
BuildSuperImage(input_tmp, super_file)
- logger.info("writing super.img to archive...")
- common.ZipWrite(output_zip, super_file, "super.img")
+ logger.info('writing super.img to archive...')
+ common.ZipWrite(output_zip, super_file, 'super.img')
def ImgFromTargetFiles(input_file, output_file):
@@ -150,9 +158,9 @@
ValueError: On invalid input.
"""
if not zipfile.is_zipfile(input_file):
- raise ValueError("%s is not a valid zipfile" % input_file)
+ raise ValueError('%s is not a valid zipfile' % input_file)
- logger.info("Building image zip from target files zip.")
+ logger.info('Building image zip from target files zip.')
# We need files under IMAGES/, OTA/, META/ for img_from_target_files.py.
# However, common.LoadInfoDict() may read additional files under BOOT/,
@@ -161,7 +169,7 @@
LoadOptions(input_tmp)
output_zip = zipfile.ZipFile(
- output_file, "w", compression=zipfile.ZIP_DEFLATED,
+ output_file, 'w', compression=zipfile.ZIP_DEFLATED,
allowZip64=not OPTIONS.sparse_userimages)
try:
@@ -169,28 +177,23 @@
CopyUserImages(input_tmp, output_zip)
WriteSuperImages(input_tmp, output_zip)
finally:
- logger.info("cleaning up...")
common.ZipClose(output_zip)
def main(argv):
- # This allows modifying the value from inner function.
- bootable_only_array = [False]
def option_handler(o, _):
- if o in ("-z", "--bootable_zip"):
- bootable_only_array[0] = True
+ if o in ('-z', '--bootable_zip'):
+ OPTIONS.bootable_only = True
else:
return False
return True
args = common.ParseOptions(argv, __doc__,
- extra_opts="z",
- extra_long_opts=["bootable_zip"],
+ extra_opts='z',
+ extra_long_opts=['bootable_zip'],
extra_option_handler=option_handler)
- OPTIONS.bootable_only = bootable_only_array[0]
-
if len(args) != 2:
common.Usage(__doc__)
sys.exit(1)
@@ -199,7 +202,7 @@
ImgFromTargetFiles(args[0], args[1])
- logger.info("done.")
+ logger.info('done.')
if __name__ == '__main__':
@@ -207,7 +210,7 @@
common.CloseInheritedPipes()
main(sys.argv[1:])
except common.ExternalError as e:
- logger.exception("\n ERROR:\n")
+ logger.exception('\n ERROR:\n')
sys.exit(1)
finally:
common.Cleanup()