From 96d51f0c54111b2dccdcaed355ae9d151af7672a Mon Sep 17 00:00:00 2001 From: SzuWei Lin Date: Thu, 12 Jul 2018 17:40:00 +0800 Subject: [PATCH 01/17] Move some BoardConfig settings from EmuCommon to GsiCommon Move the settings which effect the system image to the file BoardConfigGsiCommon.mk Bug: 80117040 Test: build aosp_arm64-userdebug and pass Change-Id: I42b14a124992c21b2da0e9e6197b1c38c6e58ce3 --- target/board/BoardConfigEmuCommon.mk | 13 +------------ target/board/BoardConfigGsiCommon.mk | 20 +++++++++++++++++++- target/board/generic/BoardConfig.mk | 1 - target/board/generic_arm64/BoardConfig.mk | 1 - target/board/generic_x86/BoardConfig.mk | 1 - target/board/generic_x86_64/BoardConfig.mk | 1 - 6 files changed, 20 insertions(+), 17 deletions(-) diff --git a/target/board/BoardConfigEmuCommon.mk b/target/board/BoardConfigEmuCommon.mk index 1d58eabc8..e8a562a22 100644 --- a/target/board/BoardConfigEmuCommon.mk +++ b/target/board/BoardConfigEmuCommon.mk @@ -11,9 +11,6 @@ HAVE_HTC_AUDIO_DRIVER := true BOARD_USES_GENERIC_AUDIO := true TARGET_BOOTLOADER_BOARD_NAME := goldfish_$(TARGET_ARCH) -TARGET_USES_64_BIT_BINDER := true -TARGET_USES_MKE2FS := true - # no hardware camera USE_CAMERA_STUB := true @@ -29,22 +26,14 @@ BUILD_QEMU_IMAGES := true USE_OPENGL_RENDERER := true TARGET_COPY_OUT_VENDOR := vendor + # ~100 MB vendor image. Please adjust system image / vendor image sizes # when finalizing them. BOARD_VENDORIMAGE_PARTITION_SIZE := 100000000 BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4 BOARD_FLASH_BLOCK_SIZE := 512 -TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true DEVICE_MATRIX_FILE := device/generic/goldfish/compatibility_matrix.xml -# Android generic system image always create metadata partition -BOARD_USES_METADATA_PARTITION := true - -# Set this to create /cache mount point for non-A/B devices that mounts /cache. -# The partition size doesn't matter, just to make build pass. -BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4 -BOARD_CACHEIMAGE_PARTITION_SIZE := 16777216 - BOARD_SEPOLICY_DIRS += device/generic/goldfish/sepolicy/common BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true diff --git a/target/board/BoardConfigGsiCommon.mk b/target/board/BoardConfigGsiCommon.mk index 237cd2887..24614dedc 100644 --- a/target/board/BoardConfigGsiCommon.mk +++ b/target/board/BoardConfigGsiCommon.mk @@ -3,6 +3,13 @@ # Common compile-time definitions for GSI # +# system.img is always ext4 with sparse option +TARGET_USERIMAGES_USE_EXT4 := true +# TODO(b/63790380): emulator doesn't support sparse yet +#TARGET_USERIMAGES_SPARSE_EXT_DISABLED := false +TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true +TARGET_USES_MKE2FS := true + # Android Verified Boot (AVB): # Builds a special vbmeta.img that disables AVB verification. # Otherwise, AVB will prevent the device from booting the generic system.img. @@ -20,9 +27,20 @@ TARGET_SYSTEM_PROP := build/make/target/board/gsi_system.prop endif BOARD_VNDK_VERSION := current -# Pi GSI supports system-as-root +# system-as-root is mandatory from Android P TARGET_NO_RECOVERY := true BOARD_BUILD_SYSTEM_ROOT_IMAGE := true +# 64 bits binder interface is mandatory from Android P +TARGET_USES_64_BIT_BINDER := true + +# Android generic system image always create metadata partition +BOARD_USES_METADATA_PARTITION := true + +# Set this to create /cache mount point for non-A/B devices that mounts /cache. +# The partition size doesn't matter, just to make build pass. +BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4 +BOARD_CACHEIMAGE_PARTITION_SIZE := 16777216 + # Audio: must using XML format for Treblized devices USE_XML_AUDIO_POLICY_CONF := 1 diff --git a/target/board/generic/BoardConfig.mk b/target/board/generic/BoardConfig.mk index 2331a4891..19d1b03c7 100644 --- a/target/board/generic/BoardConfig.mk +++ b/target/board/generic/BoardConfig.mk @@ -48,7 +48,6 @@ TARGET_CPU_ABI2 := armeabi include build/make/target/board/BoardConfigEmuCommon.mk include build/make/target/board/BoardConfigGsiCommon.mk -TARGET_USERIMAGES_USE_EXT4 := true # Partition size is default 1.5GB (1536MB) for 64 bits projects BOARD_SYSTEMIMAGE_PARTITION_SIZE := 1610612736 BOARD_USERDATAIMAGE_PARTITION_SIZE := 576716800 diff --git a/target/board/generic_arm64/BoardConfig.mk b/target/board/generic_arm64/BoardConfig.mk index 1841b981d..020d8a97a 100644 --- a/target/board/generic_arm64/BoardConfig.mk +++ b/target/board/generic_arm64/BoardConfig.mk @@ -55,7 +55,6 @@ endif include build/make/target/board/BoardConfigEmuCommon.mk include build/make/target/board/BoardConfigGsiCommon.mk -TARGET_USERIMAGES_USE_EXT4 := true BOARD_SYSTEMIMAGE_PARTITION_SIZE := 2684354560 # 2.5 GB BOARD_USERDATAIMAGE_PARTITION_SIZE := 576716800 diff --git a/target/board/generic_x86/BoardConfig.mk b/target/board/generic_x86/BoardConfig.mk index 511cd045e..ae2e6414d 100644 --- a/target/board/generic_x86/BoardConfig.mk +++ b/target/board/generic_x86/BoardConfig.mk @@ -23,7 +23,6 @@ TARGET_PRELINK_MODULE := false include build/make/target/board/BoardConfigEmuCommon.mk include build/make/target/board/BoardConfigGsiCommon.mk -TARGET_USERIMAGES_USE_EXT4 := true BOARD_SYSTEMIMAGE_PARTITION_SIZE := 2684354560 # Resize to 4G to accomodate ASAN and CTS BOARD_USERDATAIMAGE_PARTITION_SIZE := 4294967296 diff --git a/target/board/generic_x86_64/BoardConfig.mk b/target/board/generic_x86_64/BoardConfig.mk index b9d7e5a0d..7fc822d60 100755 --- a/target/board/generic_x86_64/BoardConfig.mk +++ b/target/board/generic_x86_64/BoardConfig.mk @@ -27,7 +27,6 @@ TARGET_PRELINK_MODULE := false include build/make/target/board/BoardConfigEmuCommon.mk include build/make/target/board/BoardConfigGsiCommon.mk -TARGET_USERIMAGES_USE_EXT4 := true BOARD_SYSTEMIMAGE_PARTITION_SIZE := 2684354560 # 2.5 GB BOARD_USERDATAIMAGE_PARTITION_SIZE := 576716800 From 6dd346b5b8bde5280eb4d727b92a8c77e04407d9 Mon Sep 17 00:00:00 2001 From: SzuWei Lin Date: Mon, 25 Jun 2018 17:53:49 +0800 Subject: [PATCH 02/17] Add A/B update to GSI The feature should work fine on the devices with partition _a and _b. and will not be enabled on the devices without partition _a and _b. Bug: 110763858 Test: build aosp_arm64-userdebug and aosp_arm64_ab-userdebug Change-Id: I9f783dd6fe69eff2536a6aac0506e41c724510b2 --- target/product/aosp_arm.mk | 14 ++++++++++++++ target/product/aosp_arm64.mk | 14 ++++++++++++++ target/product/aosp_arm64_ab.mk | 12 ++++++++++++ target/product/aosp_arm_ab.mk | 12 ++++++++++++ target/product/aosp_x86.mk | 14 ++++++++++++++ target/product/aosp_x86_64.mk | 14 ++++++++++++++ target/product/aosp_x86_64_ab.mk | 12 ++++++++++++ target/product/aosp_x86_ab.mk | 12 ++++++++++++ 8 files changed, 104 insertions(+) diff --git a/target/product/aosp_arm.mk b/target/product/aosp_arm.mk index b872f48fc..6f7314a1a 100644 --- a/target/product/aosp_arm.mk +++ b/target/product/aosp_arm.mk @@ -14,6 +14,13 @@ # limitations under the License. # +# The system image of aosp_arm-userdebug is a GSI for the devices with: +# - ARM 32 bits user space +# - 64 bits binder interface +# - system-as-root +# - VNDK enforcement +# - compatible property override enabled + -include device/generic/goldfish/arm32-vendor.mk # TODO(b/78308559): includes vr_hwc into GSI before vr_hwc move to vendor @@ -22,6 +29,13 @@ PRODUCT_PACKAGES += \ include $(SRC_TARGET_DIR)/product/full.mk +# Enable A/B update +AB_OTA_UPDATER := true +AB_OTA_PARTITIONS := system +PRODUCT_PACKAGES += \ + update_engine \ + update_verifier + # Needed by Pi newly launched device to pass VtsTrebleSysProp on GSI PRODUCT_COMPATIBLE_PROPERTY_OVERRIDE := true diff --git a/target/product/aosp_arm64.mk b/target/product/aosp_arm64.mk index 33defe144..297056d38 100644 --- a/target/product/aosp_arm64.mk +++ b/target/product/aosp_arm64.mk @@ -14,6 +14,13 @@ # limitations under the License. # +# The system image of aosp_arm64-userdebug is a GSI for the devices with: +# - ARM 64 bits user space +# - 64 bits binder interface +# - system-as-root +# - VNDK enforcement +# - compatible property override enabled + # This is a build configuration for a full-featured build of the # Open-Source part of the tree. It's geared toward a US-centric # build quite specifically for the emulator, and might not be @@ -38,6 +45,13 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk) $(call inherit-product, $(SRC_TARGET_DIR)/board/generic_arm64/device.mk) +# Enable A/B update +AB_OTA_UPDATER := true +AB_OTA_PARTITIONS := system +PRODUCT_PACKAGES += \ + update_engine \ + update_verifier + # Needed by Pi newly launched device to pass VtsTrebleSysProp on GSI PRODUCT_COMPATIBLE_PROPERTY_OVERRIDE := true diff --git a/target/product/aosp_arm64_ab.mk b/target/product/aosp_arm64_ab.mk index 6ff11579e..d389c74d0 100644 --- a/target/product/aosp_arm64_ab.mk +++ b/target/product/aosp_arm64_ab.mk @@ -19,8 +19,20 @@ # on the generic system image, place them in build/make/target/board/ # treble_system.prop. +# aosp_arm64_ab-userdebug is a Legacy GSI for the devices with: +# - ARM 64 bits user space +# - 64 bits binder interface +# - system-as-root + include build/make/target/product/treble_common_64.mk +# Enable A/B update +AB_OTA_UPDATER := true +AB_OTA_PARTITIONS := system +PRODUCT_PACKAGES += \ + update_engine \ + update_verifier + PRODUCT_NAME := aosp_arm64_ab PRODUCT_DEVICE := generic_arm64_ab PRODUCT_BRAND := Android diff --git a/target/product/aosp_arm_ab.mk b/target/product/aosp_arm_ab.mk index 9a4688e50..5845d3ba8 100644 --- a/target/product/aosp_arm_ab.mk +++ b/target/product/aosp_arm_ab.mk @@ -19,8 +19,20 @@ # on the generic system image, place them in build/make/target/board/ # treble_system.prop. +# aosp_arm_ab-userdebug is a Legacy GSI for the devices with: +# - ARM 32 bits user space +# - 32 bits binder interface +# - system-as-root + include build/make/target/product/treble_common_32.mk +# Enable A/B update +AB_OTA_UPDATER := true +AB_OTA_PARTITIONS := system +PRODUCT_PACKAGES += \ + update_engine \ + update_verifier + PRODUCT_NAME := aosp_arm_ab PRODUCT_DEVICE := generic_arm_ab PRODUCT_BRAND := Android diff --git a/target/product/aosp_x86.mk b/target/product/aosp_x86.mk index 9ba952343..6b1d36fc8 100644 --- a/target/product/aosp_x86.mk +++ b/target/product/aosp_x86.mk @@ -14,6 +14,13 @@ # limitations under the License. # +# The system image of aosp_x86-userdebug is a GSI for the devices with: +# - x86 32 bits user space +# - 64 bits binder interface +# - system-as-root +# - VNDK enforcement +# - compatible property override enabled + -include device/generic/goldfish/x86-vendor.mk # TODO(b/78308559): includes vr_hwc into GSI before vr_hwc move to vendor @@ -22,6 +29,13 @@ PRODUCT_PACKAGES += \ include $(SRC_TARGET_DIR)/product/full_x86.mk +# Enable A/B update +AB_OTA_UPDATER := true +AB_OTA_PARTITIONS := system +PRODUCT_PACKAGES += \ + update_engine \ + update_verifier + # Needed by Pi newly launched device to pass VtsTrebleSysProp on GSI PRODUCT_COMPATIBLE_PROPERTY_OVERRIDE := true diff --git a/target/product/aosp_x86_64.mk b/target/product/aosp_x86_64.mk index 7afc7825d..de9c6268c 100644 --- a/target/product/aosp_x86_64.mk +++ b/target/product/aosp_x86_64.mk @@ -14,6 +14,13 @@ # limitations under the License. # +# The system image of aosp_x86_64-userdebug is a GSI for the devices with: +# - x86 64 bits user space +# - 64 bits binder interface +# - system-as-root +# - VNDK enforcement +# - compatible property override enabled + # This is a build configuration for a full-featured build of the # Open-Source part of the tree. It's geared toward a US-centric # build quite specifically for the emulator, and might not be @@ -38,6 +45,13 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk) $(call inherit-product, $(SRC_TARGET_DIR)/board/generic_x86_64/device.mk) +# Enable A/B update +AB_OTA_UPDATER := true +AB_OTA_PARTITIONS := system +PRODUCT_PACKAGES += \ + update_engine \ + update_verifier + # Needed by Pi newly launched device to pass VtsTrebleSysProp on GSI PRODUCT_COMPATIBLE_PROPERTY_OVERRIDE := true diff --git a/target/product/aosp_x86_64_ab.mk b/target/product/aosp_x86_64_ab.mk index 3524dbc54..d9163d76b 100644 --- a/target/product/aosp_x86_64_ab.mk +++ b/target/product/aosp_x86_64_ab.mk @@ -19,8 +19,20 @@ # on the generic system image, place them in build/make/target/board/ # treble_system.prop. +# aosp_x86_64_ab-userdebug is a Legacy GSI for the devices with: +# - x86 64 bits user space +# - 64 bits binder interface +# - system-as-root + include build/make/target/product/treble_common_64.mk +# Enable A/B update +AB_OTA_UPDATER := true +AB_OTA_PARTITIONS := system +PRODUCT_PACKAGES += \ + update_engine \ + update_verifier + PRODUCT_NAME := aosp_x86_64_ab PRODUCT_DEVICE := generic_x86_64_ab PRODUCT_BRAND := Android diff --git a/target/product/aosp_x86_ab.mk b/target/product/aosp_x86_ab.mk index e72b38db7..4fff3d155 100644 --- a/target/product/aosp_x86_ab.mk +++ b/target/product/aosp_x86_ab.mk @@ -19,8 +19,20 @@ # on the generic system image, place them in build/make/target/board/ # treble_system.prop. +# aosp_x86_ab-userdebug is a Legacy GSI for the devices with: +# - x86 32 bits user space +# - 32 bits binder interface +# - system-as-root + include build/make/target/product/treble_common_32.mk +# Enable A/B update +AB_OTA_UPDATER := true +AB_OTA_PARTITIONS := system +PRODUCT_PACKAGES += \ + update_engine \ + update_verifier + PRODUCT_NAME := aosp_x86_ab PRODUCT_DEVICE := generic_x86_ab PRODUCT_BRAND := Android From 9cdaced77c9f33a2be59899565ed9af8b59f12fb Mon Sep 17 00:00:00 2001 From: Nan Zhang Date: Wed, 25 Jul 2018 14:26:35 -0700 Subject: [PATCH 03/17] Change timestamp to -stubs.srcjar Test: m clean && m -j docs Bug: b/70351683 Change-Id: Id036e203bbfd81a9a3c089f21d0832495027447a --- core/apidiff.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/apidiff.mk b/core/apidiff.mk index 7876c1132..23da62449 100644 --- a/core/apidiff.mk +++ b/core/apidiff.mk @@ -124,7 +124,7 @@ $(full_target): \ $(full_java_lib_deps) \ $(jdiff) \ $(doclava) \ - $(call doc-timestamp-for,$(LOCAL_MODULE)) \ + $(OUT_DOCS)/$(LOCAL_MODULE)-docs-stubs.srcjar \ $(LOCAL_ADDITIONAL_DEPENDENCIES) @echo Generating API diff: $(PRIVATE_OUT_DIR) @echo Old API: $(PRIVATE_OLDAPI) From 9ff085f906b22b2ecdd8a6335fd3dbcef438e49a Mon Sep 17 00:00:00 2001 From: Nan Zhang Date: Thu, 26 Jul 2018 02:16:42 +0000 Subject: [PATCH 04/17] Revert "Change timestamp to -stubs.srcjar" This reverts commit 9cdaced77c9f33a2be59899565ed9af8b59f12fb. Reason for revert: Change-Id: I895677dc5318d34c6e1e6449f370c9472a76a44d --- core/apidiff.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/apidiff.mk b/core/apidiff.mk index 23da62449..7876c1132 100644 --- a/core/apidiff.mk +++ b/core/apidiff.mk @@ -124,7 +124,7 @@ $(full_target): \ $(full_java_lib_deps) \ $(jdiff) \ $(doclava) \ - $(OUT_DOCS)/$(LOCAL_MODULE)-docs-stubs.srcjar \ + $(call doc-timestamp-for,$(LOCAL_MODULE)) \ $(LOCAL_ADDITIONAL_DEPENDENCIES) @echo Generating API diff: $(PRIVATE_OUT_DIR) @echo Old API: $(PRIVATE_OLDAPI) From ea0f2a27cc003770b75bb9d6dcc981503a398338 Mon Sep 17 00:00:00 2001 From: Nan Zhang Date: Thu, 26 Jul 2018 18:41:24 +0000 Subject: [PATCH 05/17] Revert "Revert "Change timestamp to -stubs.srcjar"" This reverts commit 9ff085f906b22b2ecdd8a6335fd3dbcef438e49a. Reason for revert: Change timestamp to -stubs.srcjar attempt 2 This is the second attempt to merge this CL topic. The first attempt failed because . This CL fixes this by Test: m -j out/target/common/docs/offline-sdk-timestamp Bug: b/70351683 Change-Id: I40ba48fa40b08b1a20b718fbcd5c260450397fc7 --- core/apidiff.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/apidiff.mk b/core/apidiff.mk index 7876c1132..23da62449 100644 --- a/core/apidiff.mk +++ b/core/apidiff.mk @@ -124,7 +124,7 @@ $(full_target): \ $(full_java_lib_deps) \ $(jdiff) \ $(doclava) \ - $(call doc-timestamp-for,$(LOCAL_MODULE)) \ + $(OUT_DOCS)/$(LOCAL_MODULE)-docs-stubs.srcjar \ $(LOCAL_ADDITIONAL_DEPENDENCIES) @echo Generating API diff: $(PRIVATE_OUT_DIR) @echo Old API: $(PRIVATE_OLDAPI) From 8b259b577b8fd9301a6154b5e37517d39f2a7478 Mon Sep 17 00:00:00 2001 From: Nan Zhang Date: Mon, 27 Aug 2018 11:28:43 -0700 Subject: [PATCH 06/17] [Vendor] Add a pdk droiddoc template target This is is used by offline-pdk-docs Test: N/A Bug: b/70351683 Change-Id: I7911dd80d5723eb6fa419b12b6b02e73effa15f4 --- tools/droiddoc/Android.bp | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 tools/droiddoc/Android.bp diff --git a/tools/droiddoc/Android.bp b/tools/droiddoc/Android.bp new file mode 100644 index 000000000..042806850 --- /dev/null +++ b/tools/droiddoc/Android.bp @@ -0,0 +1,18 @@ +// Copyright (C) 2013 The Android Open Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +droiddoc_exported_dir { + name: "droiddoc-templates-pdk", + path: "templates-pdk", +} From 663f40c7f3e0100604311b9913474c98c9688d4a Mon Sep 17 00:00:00 2001 From: Sundong Ahn Date: Tue, 31 Jul 2018 17:15:01 +0900 Subject: [PATCH 07/17] Rename to android.test.base.impl The name of the runtime library name for the SDK library android.test.base has changed to android.test.base.impl as it is not built using java_sdk_library construct where *.impl suffix is automatically added to the runtime lib. Bug: 77577799 Test: m -j Merged-In: I975a42412d3c71f0d7de249c08e715fdfd3eab2c Change-Id: I975a42412d3c71f0d7de249c08e715fdfd3eab2c (cherry picked from commit d21409dae6ba4ec37f6c21e9e45745fad75110bb) --- target/product/base_system.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/product/base_system.mk b/target/product/base_system.mk index 832e509bb..6f2bd211a 100644 --- a/target/product/base_system.mk +++ b/target/product/base_system.mk @@ -293,7 +293,7 @@ ifeq ($(REMOVE_ATB_FROM_BCP),true) PRODUCT_PACKAGES += framework-atb-backward-compatibility PRODUCT_BOOT_JARS += framework-atb-backward-compatibility else -PRODUCT_BOOT_JARS += android.test.base +PRODUCT_BOOT_JARS += android.test.base.impl endif PRODUCT_COPY_FILES += system/core/rootdir/init.zygote32.rc:root/init.zygote32.rc From 6936e12b10365f101c283f4b4553c3b0271d7d39 Mon Sep 17 00:00:00 2001 From: Patrik Fimml Date: Wed, 21 Nov 2018 15:39:13 +0100 Subject: [PATCH 08/17] Push cameraserver downstream from base_system.mk. Some non-phone form factors don't want cameraserver to save storage and RAM. Pushing it down to handheld and other build files allows selective inclusion to happen there. Intended to be a no-op refactoring, will disable for ATV in a follow-up CL. Bug: 118369095 Test: built system image for random device as smoke test Change-Id: I260fa5c9e512341d6a6824afebd5e8273fa5e66c --- target/product/base_system.mk | 1 - target/product/handheld_system.mk | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/target/product/base_system.mk b/target/product/base_system.mk index 07fbc3d0e..8e24aeb3d 100644 --- a/target/product/base_system.mk +++ b/target/product/base_system.mk @@ -48,7 +48,6 @@ PRODUCT_PACKAGES += \ bu \ bugreport \ bugreportz \ - cameraserver \ charger \ cmd \ com.android.location.provider \ diff --git a/target/product/handheld_system.mk b/target/product/handheld_system.mk index a961d1e8b..f874868a1 100644 --- a/target/product/handheld_system.mk +++ b/target/product/handheld_system.mk @@ -41,6 +41,7 @@ PRODUCT_PACKAGES += \ Calendar \ CalendarProvider \ Camera2 \ + cameraserver \ CaptivePortalLogin \ CertInstaller \ clatd \ From 14b4156d8d9c8269a714096fbb85e15cb2762581 Mon Sep 17 00:00:00 2001 From: Elisa Pascual Trevino Date: Wed, 28 Nov 2018 12:02:02 -0800 Subject: [PATCH 09/17] [DO NOT MERGE] Security String update to 2019-02-01 Bug: 120144419 --- core/version_defaults.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/version_defaults.mk b/core/version_defaults.mk index 84e856f69..4e3dd40d8 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -231,7 +231,7 @@ ifndef PLATFORM_SECURITY_PATCH # It must be of the form "YYYY-MM-DD" on production devices. # It must match one of the Android Security Patch Level strings of the Public Security Bulletins. # If there is no $PLATFORM_SECURITY_PATCH set, keep it empty. - PLATFORM_SECURITY_PATCH := 2019-01-05 + PLATFORM_SECURITY_PATCH := 2019-02-01 endif ifndef PLATFORM_SECURITY_PATCH_TIMESTAMP From a9c8e6165e201ba44c6fb485d4e73c43cb32175d Mon Sep 17 00:00:00 2001 From: Elisa Pascual Trevino Date: Wed, 28 Nov 2018 12:10:19 -0800 Subject: [PATCH 10/17] [DO NOT MERGE] Security String update to 2019-02-05 Bug: 120144419 --- core/version_defaults.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/version_defaults.mk b/core/version_defaults.mk index 4e3dd40d8..57e5492f9 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -231,7 +231,7 @@ ifndef PLATFORM_SECURITY_PATCH # It must be of the form "YYYY-MM-DD" on production devices. # It must match one of the Android Security Patch Level strings of the Public Security Bulletins. # If there is no $PLATFORM_SECURITY_PATCH set, keep it empty. - PLATFORM_SECURITY_PATCH := 2019-02-01 + PLATFORM_SECURITY_PATCH := 2019-02-05 endif ifndef PLATFORM_SECURITY_PATCH_TIMESTAMP From 60fa5f84ee0cb00ec9134e1d10ee5d8e94174992 Mon Sep 17 00:00:00 2001 From: Elisa Pascual Trevino Date: Mon, 3 Dec 2018 11:24:07 -0800 Subject: [PATCH 11/17] [DO NOT MERGE] Security String update to 2019-02-01 Bug: 120144419 --- core/version_defaults.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/version_defaults.mk b/core/version_defaults.mk index 2904da31d..3f4e281b6 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -181,7 +181,7 @@ ifndef PLATFORM_SECURITY_PATCH # It must be of the form "YYYY-MM-DD" on production devices. # It must match one of the Android Security Patch Level strings of the Public Security Bulletins. # If there is no $PLATFORM_SECURITY_PATCH set, keep it empty. - PLATFORM_SECURITY_PATCH := 2018-12-05 + PLATFORM_SECURITY_PATCH := 2019-02-01 endif ifndef PLATFORM_BASE_OS From 8a6d4f5439fdb63310828f3574aa5f09486142a1 Mon Sep 17 00:00:00 2001 From: Elisa Pascual Trevino Date: Mon, 3 Dec 2018 15:44:25 -0800 Subject: [PATCH 12/17] [DO NOT MERGE] Security String update to 2019-02-05 Bug: 120144419 --- core/version_defaults.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/version_defaults.mk b/core/version_defaults.mk index 3f4e281b6..d4c4dc61c 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -181,7 +181,7 @@ ifndef PLATFORM_SECURITY_PATCH # It must be of the form "YYYY-MM-DD" on production devices. # It must match one of the Android Security Patch Level strings of the Public Security Bulletins. # If there is no $PLATFORM_SECURITY_PATCH set, keep it empty. - PLATFORM_SECURITY_PATCH := 2019-02-01 + PLATFORM_SECURITY_PATCH := 2019-02-05 endif ifndef PLATFORM_BASE_OS From a1165c3723c9d58afc83202ff63c6f691737effb Mon Sep 17 00:00:00 2001 From: Adam Seaton Date: Tue, 8 Jan 2019 13:59:01 -0800 Subject: [PATCH 13/17] Update Platform Security String to 2019-03-01 for pi-dev Bug:122541777 --- core/version_defaults.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/version_defaults.mk b/core/version_defaults.mk index 57e5492f9..b64dd1b7b 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -231,7 +231,7 @@ ifndef PLATFORM_SECURITY_PATCH # It must be of the form "YYYY-MM-DD" on production devices. # It must match one of the Android Security Patch Level strings of the Public Security Bulletins. # If there is no $PLATFORM_SECURITY_PATCH set, keep it empty. - PLATFORM_SECURITY_PATCH := 2019-02-05 + PLATFORM_SECURITY_PATCH := 2019-03-01 endif ifndef PLATFORM_SECURITY_PATCH_TIMESTAMP From ac6eac206d0e4b0604a362d1bcbfae3e1b03bfc2 Mon Sep 17 00:00:00 2001 From: Adam Seaton Date: Tue, 8 Jan 2019 14:29:13 -0800 Subject: [PATCH 14/17] Update Platform Security String to 2019-03-05 for pi-dev Bug:122541777 --- core/version_defaults.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/version_defaults.mk b/core/version_defaults.mk index b64dd1b7b..d386a527f 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -231,7 +231,7 @@ ifndef PLATFORM_SECURITY_PATCH # It must be of the form "YYYY-MM-DD" on production devices. # It must match one of the Android Security Patch Level strings of the Public Security Bulletins. # If there is no $PLATFORM_SECURITY_PATCH set, keep it empty. - PLATFORM_SECURITY_PATCH := 2019-03-01 + PLATFORM_SECURITY_PATCH := 2019-03-05 endif ifndef PLATFORM_SECURITY_PATCH_TIMESTAMP From 7a403979d6e88c0868de53257d427e76aaa5334a Mon Sep 17 00:00:00 2001 From: Adam Seaton Date: Tue, 8 Jan 2019 14:38:23 -0800 Subject: [PATCH 15/17] [DO NOT MERGE] Update Platform Security String to 2019-03-01 for nyc-dev Bug:122541777 --- core/version_defaults.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/version_defaults.mk b/core/version_defaults.mk index 7b5dfd4de..4ad08d324 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -114,7 +114,7 @@ ifeq "" "$(PLATFORM_SECURITY_PATCH)" # It must be of the form "YYYY-MM-DD" on production devices. # It must match one of the Android Security Patch Level strings of the Public Security Bulletins. # If there is no $PLATFORM_SECURITY_PATCH set, keep it empty. - PLATFORM_SECURITY_PATCH := 2018-05-01 + PLATFORM_SECURITY_PATCH := 2019-03-01 endif ifeq "" "$(PLATFORM_BASE_OS)" From 6698efad06be4f6e57f9381290d709c7b649ea7c Mon Sep 17 00:00:00 2001 From: Adam Seaton Date: Tue, 8 Jan 2019 14:33:46 -0800 Subject: [PATCH 16/17] [DO NOT MERGE] Update Platform Security String to 2019-03-01 for oc-mr1-dev Bug:122541777 --- core/version_defaults.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/version_defaults.mk b/core/version_defaults.mk index d4c4dc61c..69cba6894 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -181,7 +181,7 @@ ifndef PLATFORM_SECURITY_PATCH # It must be of the form "YYYY-MM-DD" on production devices. # It must match one of the Android Security Patch Level strings of the Public Security Bulletins. # If there is no $PLATFORM_SECURITY_PATCH set, keep it empty. - PLATFORM_SECURITY_PATCH := 2019-02-05 + PLATFORM_SECURITY_PATCH := 2019-03-01 endif ifndef PLATFORM_BASE_OS From eb164e06b2ba8141d84b8e6169fb714e7f209302 Mon Sep 17 00:00:00 2001 From: Adam Seaton Date: Tue, 8 Jan 2019 14:35:03 -0800 Subject: [PATCH 17/17] [DO NOT MERGE] Update Platform Security String to 2019-03-05 for oc-mr1-dev Bug:122541777 --- core/version_defaults.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/version_defaults.mk b/core/version_defaults.mk index 69cba6894..028e6c68b 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -181,7 +181,7 @@ ifndef PLATFORM_SECURITY_PATCH # It must be of the form "YYYY-MM-DD" on production devices. # It must match one of the Android Security Patch Level strings of the Public Security Bulletins. # If there is no $PLATFORM_SECURITY_PATCH set, keep it empty. - PLATFORM_SECURITY_PATCH := 2019-03-01 + PLATFORM_SECURITY_PATCH := 2019-03-05 endif ifndef PLATFORM_BASE_OS