Merge "Merge Android R"
This commit is contained in:
Xin Li
Gerrit Code Review
commit
a51b1b857b
32
CleanSpec.mk
32
CleanSpec.mk
|
|
@ -505,9 +505,9 @@ $(call add-clean-step, rm -rf $(TARGET_RECOVERY_ROOT_OUT)/etc)
|
|||
|
||||
# Remove *_OUT_INTERMEDIATE_LIBRARIES
|
||||
$(call add-clean-step, rm -rf $(addsuffix /lib,\
|
||||
$(HOST_OUT_INTERMEDIATES) $(2ND_HOST_OUT_INTERMEDIATES) \
|
||||
$(HOST_CROSS_OUT_INTERMEDIATES) $(2ND_HOST_CROSS_OUT_INTERMEDIATES) \
|
||||
$(TARGET_OUT_INTERMEDIATES) $(2ND_TARGET_OUT_INTERMEDIATES)))
|
||||
$(HOST_OUT_INTERMEDIATES) $(2ND_HOST_OUT_INTERMEDIATES) \
|
||||
$(HOST_CROSS_OUT_INTERMEDIATES) $(2ND_HOST_CROSS_OUT_INTERMEDIATES) \
|
||||
$(TARGET_OUT_INTERMEDIATES) $(2ND_TARGET_OUT_INTERMEDIATES)))
|
||||
|
||||
# Remove strip.sh intermediates to save space
|
||||
$(call add-clean-step, find $(OUT_DIR) \( -name "*.so.debug" -o -name "*.so.dynsyms" -o -name "*.so.funcsyms" -o -name "*.so.keep_symbols" -o -name "*.so.mini_debuginfo.xz" \) -print0 | xargs -0 rm -f)
|
||||
|
|
@ -646,6 +646,8 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib*/libstagefright_soft*)
|
|||
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/odm/build.prop)
|
||||
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/odm/build.prop)
|
||||
|
||||
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/apex)
|
||||
|
||||
# Remove libcameraservice and libcamera_client from base_system
|
||||
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib*/libcameraservice.so)
|
||||
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib*/libcamera_client.so)
|
||||
|
|
@ -685,6 +687,9 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/apex)
|
|||
# Migrate preopt files to system_other for some devices
|
||||
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/*/*app/*/oat)
|
||||
|
||||
# Migrate preopt files from system_other for some devices
|
||||
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system_other)
|
||||
|
||||
# Remove Android Core Library artifacts from the system partition, now
|
||||
# that they live in the ART APEX (b/142944799).
|
||||
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/framework/*.jar)
|
||||
|
|
@ -699,9 +704,27 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib*/vndk-*)
|
|||
# again, as the original change removing them was reverted.
|
||||
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/framework/*.jar)
|
||||
|
||||
# Remove cas@1.1 from the vendor partition
|
||||
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/bin/hw/android.hardware.cas@1.1*)
|
||||
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/etc/init/android.hardware.cas@1.1*)
|
||||
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/etc/vintf/manifest/android.hardware.cas@1.1*)
|
||||
|
||||
# Remove com.android.cellbroadcast apex for Go devices
|
||||
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/apex/com.android.cellbroadcast.apex)
|
||||
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/apex/com.android.cellbroadcast)
|
||||
|
||||
# Remove CellBroadcastLegacyApp for Go devices
|
||||
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/priv-app/CellBroadcastLegacyApp)
|
||||
|
||||
# Remove MediaProvider after moving into APEX
|
||||
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/priv-app/MediaProvider)
|
||||
|
||||
# The core image variant has been renamed to ""
|
||||
$(call add-clean-step, find $(SOONG_OUT_DIR)/.intermediates -type d -name "android_*_core*" -print0 | xargs -0 rm -rf)
|
||||
|
||||
# Remove 'media' command
|
||||
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/bin/media)
|
||||
|
||||
# Remove CtsShim apks from system partition, since the have been moved inside
|
||||
# the cts shim apex. Also remove the cts shim apex prebuilt since it has been
|
||||
# removed in flattened apexs configurations.
|
||||
|
|
@ -713,6 +736,9 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/apex/com.android.apex.cts.sh
|
|||
$(call add-clean-step, find $(SOONG_OUT_DIR)/.intermediates -type d -name "android_*_recovery*" -print0 | xargs -0 rm -rf)
|
||||
$(call add-clean-step, find $(SOONG_OUT_DIR)/.intermediates -type d -name "android_*_vendor*" -print0 | xargs -0 rm -rf)
|
||||
|
||||
# Remove PermissionController after moving into APEX
|
||||
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/priv-app/*PermissionController)
|
||||
|
||||
# Clean up VTS-Core and VTS10 related artifacts.
|
||||
$(call add-clean-step, rm -rf $(HOST_OUT)/vts-core/*)
|
||||
$(call add-clean-step, rm -rf $(HOST_OUT)/framework/vts-core-tradefed.jar)
|
||||
|
|
|
|||
|
|
@ -753,7 +753,7 @@ endif
|
|||
endif
|
||||
|
||||
INTERNAL_MKBOOTIMG_VERSION_ARGS := \
|
||||
--os_version $(PLATFORM_VERSION) \
|
||||
--os_version $(PLATFORM_VERSION_LAST_STABLE) \
|
||||
--os_patch_level $(PLATFORM_SECURITY_PATCH)
|
||||
|
||||
# Define these only if we are building boot
|
||||
|
|
@ -1040,6 +1040,8 @@ license_modules := $(filter-out $(TARGET_OUT_FAKE)/%,$(license_modules))
|
|||
license_modules := $(filter-out $(TARGET_OUT_TESTCASES)/%,$(license_modules))
|
||||
# filesystem images: system, vendor, product, system_ext, odm, vendor_dlkm, and odm_dlkm
|
||||
license_modules_system := $(filter $(TARGET_OUT)/%,$(license_modules))
|
||||
# system_other is relevant to system partition.
|
||||
license_modules_system += $(filter $(TARGET_OUT_SYSTEM_OTHER)/%,$(license_modules))
|
||||
license_modules_vendor := $(filter $(TARGET_OUT_VENDOR)/%,$(license_modules))
|
||||
license_modules_product := $(filter $(TARGET_OUT_PRODUCT)/%,$(license_modules))
|
||||
license_modules_system_ext := $(filter $(TARGET_OUT_SYSTEM_EXT)/%,$(license_modules))
|
||||
|
|
@ -3126,22 +3128,22 @@ endif
|
|||
|
||||
BOARD_AVB_SYSTEM_ADD_HASHTREE_FOOTER_ARGS += \
|
||||
--prop com.android.build.system.fingerprint:$(BUILD_FINGERPRINT_FROM_FILE) \
|
||||
--prop com.android.build.system.os_version:$(PLATFORM_VERSION) \
|
||||
--prop com.android.build.system.os_version:$(PLATFORM_VERSION_LAST_STABLE) \
|
||||
--prop com.android.build.system.security_patch:$(PLATFORM_SECURITY_PATCH)
|
||||
|
||||
BOARD_AVB_PRODUCT_ADD_HASHTREE_FOOTER_ARGS += \
|
||||
--prop com.android.build.product.fingerprint:$(BUILD_FINGERPRINT_FROM_FILE) \
|
||||
--prop com.android.build.product.os_version:$(PLATFORM_VERSION) \
|
||||
--prop com.android.build.product.os_version:$(PLATFORM_VERSION_LAST_STABLE) \
|
||||
--prop com.android.build.product.security_patch:$(PLATFORM_SECURITY_PATCH)
|
||||
|
||||
BOARD_AVB_SYSTEM_EXT_ADD_HASHTREE_FOOTER_ARGS += \
|
||||
--prop com.android.build.system_ext.fingerprint:$(BUILD_FINGERPRINT_FROM_FILE) \
|
||||
--prop com.android.build.system_ext.os_version:$(PLATFORM_VERSION) \
|
||||
--prop com.android.build.system_ext.os_version:$(PLATFORM_VERSION_LAST_STABLE) \
|
||||
--prop com.android.build.system_ext.security_patch:$(PLATFORM_SECURITY_PATCH)
|
||||
|
||||
BOARD_AVB_BOOT_ADD_HASH_FOOTER_ARGS += \
|
||||
--prop com.android.build.boot.fingerprint:$(BUILD_FINGERPRINT_FROM_FILE) \
|
||||
--prop com.android.build.boot.os_version:$(PLATFORM_VERSION)
|
||||
--prop com.android.build.boot.os_version:$(PLATFORM_VERSION_LAST_STABLE)
|
||||
|
||||
BOARD_AVB_VENDOR_BOOT_ADD_HASH_FOOTER_ARGS += \
|
||||
--prop com.android.build.vendor_boot.fingerprint:$(BUILD_FINGERPRINT_FROM_FILE) \
|
||||
|
|
@ -3151,11 +3153,11 @@ BOARD_AVB_RECOVERY_ADD_HASH_FOOTER_ARGS += \
|
|||
|
||||
BOARD_AVB_VENDOR_ADD_HASHTREE_FOOTER_ARGS += \
|
||||
--prop com.android.build.vendor.fingerprint:$(BUILD_FINGERPRINT_FROM_FILE) \
|
||||
--prop com.android.build.vendor.os_version:$(PLATFORM_VERSION)
|
||||
--prop com.android.build.vendor.os_version:$(PLATFORM_VERSION_LAST_STABLE)
|
||||
|
||||
BOARD_AVB_ODM_ADD_HASHTREE_FOOTER_ARGS += \
|
||||
--prop com.android.build.odm.fingerprint:$(BUILD_FINGERPRINT_FROM_FILE) \
|
||||
--prop com.android.build.odm.os_version:$(PLATFORM_VERSION)
|
||||
--prop com.android.build.odm.os_version:$(PLATFORM_VERSION_LAST_STABLE)
|
||||
|
||||
BOARD_AVB_VENDOR_DLKM_ADD_HASHTREE_FOOTER_ARGS += \
|
||||
--prop com.android.build.vendor_dlkm.fingerprint:$(BUILD_FINGERPRINT_FROM_FILE) \
|
||||
|
|
|
|||
|
|
@ -768,7 +768,7 @@ BUILD_DATETIME_FROM_FILE := $$(cat $(BUILD_DATETIME_FILE))
|
|||
# is made which breaks compatibility with the previous platform sepolicy version,
|
||||
# not just on every increase in PLATFORM_SDK_VERSION. The minor version should
|
||||
# be reset to 0 on every bump of the PLATFORM_SDK_VERSION.
|
||||
sepolicy_major_vers := 29
|
||||
sepolicy_major_vers := 30
|
||||
sepolicy_minor_vers := 0
|
||||
|
||||
ifneq ($(sepolicy_major_vers), $(PLATFORM_SDK_VERSION))
|
||||
|
|
|
|||
|
|
@ -3187,11 +3187,12 @@ endef
|
|||
|
||||
###########################################################
|
||||
## Find system_$(VER) in LOCAL_SDK_VERSION
|
||||
## note: system_server_* is excluded. It's a different API surface
|
||||
##
|
||||
## $(1): LOCAL_SDK_VERSION
|
||||
###########################################################
|
||||
define has-system-sdk-version
|
||||
$(filter system_%,$(1))
|
||||
$(filter-out system_server_%,$(filter system_%,$(1)))
|
||||
endef
|
||||
|
||||
###########################################################
|
||||
|
|
|
|||
|
|
@ -81,6 +81,8 @@ $(shell mkdir -p $(EMPTY_DIRECTORY) && rm -rf $(EMPTY_DIRECTORY)/*)
|
|||
-include test/mts/tools/build/config.mk
|
||||
# VTS-Core-specific config.
|
||||
-include test/vts/tools/vts-core-tradefed/build/config.mk
|
||||
# CSUITE-specific config.
|
||||
-include test/app_compat/csuite/tools/build/config.mk
|
||||
|
||||
# Clean rules
|
||||
.PHONY: clean-dex-files
|
||||
|
|
@ -1794,9 +1796,11 @@ else ifeq (,$(TARGET_BUILD_UNBUNDLED))
|
|||
# Put XML formatted API files in the dist dir.
|
||||
$(TARGET_OUT_COMMON_INTERMEDIATES)/api.xml: $(call java-lib-files,android_stubs_current) $(APICHECK)
|
||||
$(TARGET_OUT_COMMON_INTERMEDIATES)/system-api.xml: $(call java-lib-files,android_system_stubs_current) $(APICHECK)
|
||||
$(TARGET_OUT_COMMON_INTERMEDIATES)/module-lib-api.xml: $(call java-lib-files,android_module_lib_stubs_current) $(APICHECK)
|
||||
$(TARGET_OUT_COMMON_INTERMEDIATES)/system-server-api.xml: $(call java-lib-files,android_system_server_stubs_current) $(APICHECK)
|
||||
$(TARGET_OUT_COMMON_INTERMEDIATES)/test-api.xml: $(call java-lib-files,android_test_stubs_current) $(APICHECK)
|
||||
|
||||
api_xmls := $(addprefix $(TARGET_OUT_COMMON_INTERMEDIATES)/,api.xml system-api.xml test-api.xml)
|
||||
api_xmls := $(addprefix $(TARGET_OUT_COMMON_INTERMEDIATES)/,api.xml system-api.xml module-lib-api.xml system-server-api.xml test-api.xml)
|
||||
$(api_xmls):
|
||||
$(hide) echo "Converting API file to XML: $@"
|
||||
$(hide) mkdir -p $(dir $@)
|
||||
|
|
|
|||
|
|
@ -19,9 +19,9 @@ SDK_FONT_TEMP := $(call intermediates-dir-for,PACKAGING,sdk-fonts,HOST,COMMON)
|
|||
|
||||
# The font configuration files - system_fonts.xml, fallback_fonts.xml etc.
|
||||
sdk_font_config := $(sort $(wildcard frameworks/base/data/fonts/*.xml))
|
||||
sdk_font_config := $(addprefix $(SDK_FONT_TEMP)/, $(notdir $(sdk_font_config)))
|
||||
sdk_font_config := $(addprefix $(SDK_FONT_TEMP)/standard/, $(notdir $(sdk_font_config)))
|
||||
|
||||
$(sdk_font_config): $(SDK_FONT_TEMP)/%.xml: \
|
||||
$(sdk_font_config): $(SDK_FONT_TEMP)/standard/%.xml: \
|
||||
frameworks/base/data/fonts/%.xml
|
||||
$(hide) mkdir -p $(dir $@)
|
||||
$(hide) cp -vf $< $@
|
||||
|
|
|
|||
|
|
@ -122,8 +122,6 @@ dalvik\..*
|
|||
libcore\..*
|
||||
android\..*
|
||||
com\.android\..*
|
||||
|
||||
|
||||
###################################################
|
||||
# android.test.base.jar
|
||||
junit\.extensions
|
||||
|
|
@ -241,6 +239,8 @@ org\.apache\.xalan\.xslt
|
|||
# Packages in the google namespace across all bootclasspath jars.
|
||||
com\.google\.android\..*
|
||||
com\.google\.vr\.platform.*
|
||||
com\.google\.i18n\.phonenumbers\..*
|
||||
com\.google\.i18n\.phonenumbers
|
||||
|
||||
###################################################
|
||||
# Packages used for Android in Chrome OS
|
||||
|
|
|
|||
|
|
@ -0,0 +1,23 @@
|
|||
# Copyright (C) 2019 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.
|
||||
|
||||
test_suite_name := csuite
|
||||
test_suite_tradefed := csuite-tradefed
|
||||
test_suite_readme := test/app_compat/csuite/README.md
|
||||
|
||||
include $(BUILD_SYSTEM)/tasks/tools/compatibility.mk
|
||||
|
||||
.PHONY: csuite
|
||||
csuite: $(compatibility_zip)
|
||||
$(call dist-for-goals, csuite, $(compatibility_zip))
|
||||
|
|
@ -50,7 +50,7 @@ my_missing_files = $(shell $(call echo-warning,$(my_makefile),$(my_package_name)
|
|||
ifeq ($(ALLOW_MISSING_DEPENDENCIES),true)
|
||||
# Ignore unknown installed files on partial builds
|
||||
my_missing_files =
|
||||
else ifeq ($(my_modules_strict),true)
|
||||
else ifneq ($(my_modules_strict),false)
|
||||
my_missing_files = $(shell $(call echo-error,$(my_makefile),$(my_package_name): Unknown installed file for module '$(1)'))$(eval my_missing_error := true)
|
||||
endif
|
||||
|
||||
|
|
|
|||
|
|
@ -84,40 +84,17 @@ MAX_PLATFORM_VERSION :=
|
|||
# generate the range of allowed SDK versions, so it must have an entry for every
|
||||
# unreleased API level targetable by this branch, not just those that are valid
|
||||
# lunch targets for this branch.
|
||||
PLATFORM_VERSION.RP1A := R
|
||||
PLATFORM_VERSION.SP1A := S
|
||||
|
||||
# The last stable version name of the platform that was released. During
|
||||
# development, this stays at that previous version, while the codename indicates
|
||||
# further work based on the previous version.
|
||||
PLATFORM_VERSION_LAST_STABLE := 11
|
||||
.KATI_READONLY := PLATFORM_VERSION_LAST_STABLE
|
||||
|
||||
# These are the current development codenames, if the build is not a final
|
||||
# release build. If this is a final release build, it is simply "REL".
|
||||
PLATFORM_VERSION_CODENAME.RP1A := R
|
||||
PLATFORM_VERSION_CODENAME.SP1A := S
|
||||
|
||||
ifndef PLATFORM_VERSION
|
||||
PLATFORM_VERSION := $(PLATFORM_VERSION.$(TARGET_PLATFORM_VERSION))
|
||||
ifndef PLATFORM_VERSION
|
||||
# PLATFORM_VERSION falls back to TARGET_PLATFORM_VERSION
|
||||
PLATFORM_VERSION := $(TARGET_PLATFORM_VERSION)
|
||||
endif
|
||||
endif
|
||||
.KATI_READONLY := PLATFORM_VERSION
|
||||
|
||||
ifndef PLATFORM_SDK_VERSION
|
||||
# This is the canonical definition of the SDK version, which defines
|
||||
# the set of APIs and functionality available in the platform. It
|
||||
# is a single integer that increases monotonically as updates to
|
||||
# the SDK are released. It should only be incremented when the APIs for
|
||||
# the new release are frozen (so that developers don't write apps against
|
||||
# intermediate builds). During development, this number remains at the
|
||||
# SDK version the branch is based on and PLATFORM_VERSION_CODENAME holds
|
||||
# the code-name of the new development work.
|
||||
|
||||
# When you increment the PLATFORM_SDK_VERSION please ensure you also
|
||||
# clear out the following text file of all older PLATFORM_VERSION's:
|
||||
# cts/tests/tests/os/assets/platform_versions.txt
|
||||
PLATFORM_SDK_VERSION := 29
|
||||
endif
|
||||
.KATI_READONLY := PLATFORM_SDK_VERSION
|
||||
|
||||
ifndef PLATFORM_VERSION_CODENAME
|
||||
PLATFORM_VERSION_CODENAME := $(PLATFORM_VERSION_CODENAME.$(TARGET_PLATFORM_VERSION))
|
||||
ifndef PLATFORM_VERSION_CODENAME
|
||||
|
|
@ -152,6 +129,32 @@ endif
|
|||
PLATFORM_VERSION_CODENAME \
|
||||
PLATFORM_VERSION_ALL_CODENAMES
|
||||
|
||||
ifndef PLATFORM_VERSION
|
||||
ifeq (REL,$(PLATFORM_VERSION_CODENAME))
|
||||
PLATFORM_VERSION := $(PLATFORM_VERSION_LAST_STABLE)
|
||||
else
|
||||
PLATFORM_VERSION := $(PLATFORM_VERSION_CODENAME)
|
||||
endif
|
||||
endif
|
||||
.KATI_READONLY := PLATFORM_VERSION
|
||||
|
||||
ifndef PLATFORM_SDK_VERSION
|
||||
# This is the canonical definition of the SDK version, which defines
|
||||
# the set of APIs and functionality available in the platform. It
|
||||
# is a single integer that increases monotonically as updates to
|
||||
# the SDK are released. It should only be incremented when the APIs for
|
||||
# the new release are frozen (so that developers don't write apps against
|
||||
# intermediate builds). During development, this number remains at the
|
||||
# SDK version the branch is based on and PLATFORM_VERSION_CODENAME holds
|
||||
# the code-name of the new development work.
|
||||
|
||||
# When you increment the PLATFORM_SDK_VERSION please ensure you also
|
||||
# clear out the following text file of all older PLATFORM_VERSION's:
|
||||
# cts/tests/tests/os/assets/platform_versions.txt
|
||||
PLATFORM_SDK_VERSION := 30
|
||||
endif
|
||||
.KATI_READONLY := PLATFORM_SDK_VERSION
|
||||
|
||||
ifeq (REL,$(PLATFORM_VERSION_CODENAME))
|
||||
PLATFORM_PREVIEW_SDK_VERSION := 0
|
||||
else
|
||||
|
|
@ -237,7 +240,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 := 2020-08-05
|
||||
PLATFORM_SECURITY_PATCH := 2020-09-05
|
||||
endif
|
||||
.KATI_READONLY := PLATFORM_SECURITY_PATCH
|
||||
|
||||
|
|
|
|||
|
|
@ -58,6 +58,7 @@ TARGET_NO_KERNEL := false
|
|||
TARGET_NO_VENDOR_BOOT := true
|
||||
BOARD_USES_RECOVERY_AS_BOOT := true
|
||||
|
||||
BOARD_KERNEL-4.19-GZ_BOOTIMAGE_PARTITION_SIZE := 47185920
|
||||
BOARD_KERNEL-5.4_BOOTIMAGE_PARTITION_SIZE := 67108864
|
||||
BOARD_KERNEL-5.4-ALLSYMS_BOOTIMAGE_PARTITION_SIZE := 67108864
|
||||
BOARD_KERNEL-5.4-GZ_BOOTIMAGE_PARTITION_SIZE := 47185920
|
||||
|
|
@ -74,7 +75,7 @@ BOARD_RAMDISK_USE_LZ4 := true
|
|||
BOARD_BOOT_HEADER_VERSION := 3
|
||||
BOARD_MKBOOTIMG_ARGS += --header_version $(BOARD_BOOT_HEADER_VERSION)
|
||||
|
||||
BOARD_KERNEL_BINARIES := kernel-5.4 kernel-5.4-gz kernel-5.4-lz4 \
|
||||
BOARD_KERNEL_BINARIES := kernel-4.19-gz kernel-5.4 kernel-5.4-gz kernel-5.4-lz4 \
|
||||
kernel-mainline kernel-mainline-gz kernel-mainline-lz4
|
||||
ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT)))
|
||||
BOARD_KERNEL_BINARIES += kernel-5.4-allsyms kernel-5.4-gz-allsyms kernel-5.4-lz4-allsyms
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@
|
|||
#
|
||||
|
||||
PRODUCT_COPY_FILES += \
|
||||
kernel/prebuilts/4.19/arm64/Image.gz:kernel-4.19-gz \
|
||||
device/google/cuttlefish_kernel/5.4-arm64/kernel-5.4:kernel-5.4 \
|
||||
device/google/cuttlefish_kernel/5.4-arm64/kernel-5.4-gz:kernel-5.4-gz \
|
||||
device/google/cuttlefish_kernel/5.4-arm64/kernel-5.4-lz4:kernel-5.4-lz4 \
|
||||
|
|
|
|||
|
|
@ -31,6 +31,7 @@ PRODUCT_PRODUCT_PROPERTIES += \
|
|||
PRODUCT_PACKAGES += \
|
||||
messaging \
|
||||
PhotoTable \
|
||||
preinstalled-packages-platform-aosp-product.xml \
|
||||
WallpaperPicker \
|
||||
|
||||
# Telephony:
|
||||
|
|
|
|||
|
|
@ -27,7 +27,6 @@ PRODUCT_PACKAGES += \
|
|||
android.test.base \
|
||||
android.test.mock \
|
||||
android.test.runner \
|
||||
ANGLE \
|
||||
apexd \
|
||||
appops \
|
||||
app_process \
|
||||
|
|
@ -38,6 +37,7 @@ PRODUCT_PACKAGES += \
|
|||
bcc \
|
||||
blank_screen \
|
||||
blkid \
|
||||
service-blobstore \
|
||||
bmgr \
|
||||
bootanimation \
|
||||
bootstat \
|
||||
|
|
@ -50,21 +50,27 @@ PRODUCT_PACKAGES += \
|
|||
charger \
|
||||
cmd \
|
||||
com.android.adbd \
|
||||
com.android.apex.cts.shim.v1 \
|
||||
com.android.conscrypt \
|
||||
com.android.cronet \
|
||||
com.android.extservices \
|
||||
com.android.i18n \
|
||||
com.android.ipsec \
|
||||
com.android.location.provider \
|
||||
com.android.media \
|
||||
com.android.media.swcodec \
|
||||
com.android.mediaprovider \
|
||||
com.android.os.statsd \
|
||||
com.android.permission \
|
||||
com.android.resolv \
|
||||
com.android.neuralnetworks \
|
||||
com.android.sdkext \
|
||||
com.android.tethering \
|
||||
com.android.tzdata \
|
||||
com.android.wifi \
|
||||
ContactsProvider \
|
||||
content \
|
||||
CtsShimPrebuilt \
|
||||
CtsShimPrivPrebuilt \
|
||||
debuggerd\
|
||||
device_config \
|
||||
dmctl \
|
||||
|
|
@ -75,7 +81,6 @@ PRODUCT_PACKAGES += \
|
|||
dumpsys \
|
||||
DynamicSystemInstallationService \
|
||||
e2fsck \
|
||||
ExtServices \
|
||||
ExtShared \
|
||||
flags_health_check \
|
||||
framework-minus-apex \
|
||||
|
|
@ -94,7 +99,6 @@ PRODUCT_PACKAGES += \
|
|||
gpuservice \
|
||||
hid \
|
||||
hwservicemanager \
|
||||
idmap \
|
||||
idmap2 \
|
||||
idmap2d \
|
||||
ime \
|
||||
|
|
@ -102,6 +106,7 @@ PRODUCT_PACKAGES += \
|
|||
incident \
|
||||
incidentd \
|
||||
incident_helper \
|
||||
incident-helper-cmd \
|
||||
init.environ.rc \
|
||||
init_system \
|
||||
input \
|
||||
|
|
@ -111,7 +116,9 @@ PRODUCT_PACKAGES += \
|
|||
iptables \
|
||||
ip-up-vpn \
|
||||
javax.obex \
|
||||
service-jobscheduler \
|
||||
keystore \
|
||||
credstore \
|
||||
ld.mc \
|
||||
libaaudio \
|
||||
libamidi \
|
||||
|
|
@ -161,7 +168,6 @@ PRODUCT_PACKAGES += \
|
|||
libOpenMAXAL \
|
||||
libOpenSLES \
|
||||
libpdfium \
|
||||
libpixelflinger \
|
||||
libpower \
|
||||
libpowermanager \
|
||||
libradio_metadata \
|
||||
|
|
@ -184,7 +190,6 @@ PRODUCT_PACKAGES += \
|
|||
libusbhost \
|
||||
libutils \
|
||||
libvulkan \
|
||||
libwifi-service \
|
||||
libwilhelm \
|
||||
linker \
|
||||
linkerconfig \
|
||||
|
|
@ -197,13 +202,11 @@ PRODUCT_PACKAGES += \
|
|||
lpdump \
|
||||
lshal \
|
||||
mdnsd \
|
||||
media \
|
||||
mediacodec.policy \
|
||||
mediadrmserver \
|
||||
mediaextractor \
|
||||
mediametrics \
|
||||
media_profiles_V1_0.dtd \
|
||||
MediaProvider \
|
||||
MediaProviderLegacy \
|
||||
mediaserver \
|
||||
mke2fs \
|
||||
monkey \
|
||||
|
|
@ -216,12 +219,12 @@ PRODUCT_PACKAGES += \
|
|||
PackageInstaller \
|
||||
passwd_system \
|
||||
perfetto \
|
||||
PermissionController \
|
||||
ping \
|
||||
ping6 \
|
||||
platform.xml \
|
||||
pm \
|
||||
pppd \
|
||||
preinstalled-packages-platform.xml \
|
||||
privapp-permissions-platform.xml \
|
||||
racoon \
|
||||
recovery-persist \
|
||||
|
|
@ -246,7 +249,7 @@ PRODUCT_PACKAGES += \
|
|||
shell_and_utilities_system \
|
||||
sm \
|
||||
snapshotctl \
|
||||
statsd \
|
||||
SoundPicker \
|
||||
storaged \
|
||||
surfaceflinger \
|
||||
svc \
|
||||
|
|
@ -269,7 +272,7 @@ PRODUCT_PACKAGES += \
|
|||
WallpaperBackup \
|
||||
watchdogd \
|
||||
wificond \
|
||||
wifi-service \
|
||||
wifi.rc \
|
||||
wm \
|
||||
|
||||
# VINTF data for system image
|
||||
|
|
@ -325,12 +328,16 @@ PRODUCT_BOOT_JARS := \
|
|||
com.android.i18n:core-icu4j \
|
||||
telephony-common \
|
||||
voip-common \
|
||||
ims-common \
|
||||
ims-common
|
||||
|
||||
PRODUCT_UPDATABLE_BOOT_JARS := \
|
||||
com.android.conscrypt:conscrypt \
|
||||
com.android.media:updatable-media \
|
||||
com.android.mediaprovider:framework-mediaprovider \
|
||||
com.android.os.statsd:framework-statsd \
|
||||
com.android.permission:framework-permission \
|
||||
com.android.sdkext:framework-sdkextensions \
|
||||
com.android.wifi:framework-wifi \
|
||||
com.android.tethering:framework-tethering
|
||||
|
||||
PRODUCT_COPY_FILES += \
|
||||
|
|
@ -352,6 +359,7 @@ PRODUCT_COPY_FILES += system/core/rootdir/init.zygote32.rc:system/etc/init/hw/in
|
|||
PRODUCT_SYSTEM_PROPERTIES += ro.zygote?=zygote32
|
||||
|
||||
PRODUCT_SYSTEM_PROPERTIES += debug.atrace.tags.enableflags=0
|
||||
PRODUCT_SYSTEM_PROPERTIES += persist.traced.enable=1
|
||||
|
||||
PRODUCT_PROPERTY_OVERRIDES += ro.gfx.angle.supported=true
|
||||
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ PRODUCT_HOST_PACKAGES += \
|
|||
|
||||
# Base modules and settings for the vendor partition.
|
||||
PRODUCT_PACKAGES += \
|
||||
android.hardware.cas@1.1-service \
|
||||
android.hardware.cas@1.2-service \
|
||||
android.hardware.media.omx@1.0-service \
|
||||
boringssl_self_test_vendor \
|
||||
dumpsys_vendor \
|
||||
|
|
|
|||
|
|
@ -19,3 +19,5 @@ PRODUCT_VENDOR_PROPERTIES += external_storage.projid.enabled=1
|
|||
|
||||
PRODUCT_FS_CASEFOLD := 1
|
||||
PRODUCT_VENDOR_PROPERTIES += external_storage.casefold.enabled=1
|
||||
|
||||
PRODUCT_VENDOR_PROPERTIES += external_storage.sdcardfs.enabled=0
|
||||
|
|
|
|||
|
|
@ -50,12 +50,6 @@ $(call inherit-product-if-exists, device/generic/goldfish/vendor.mk)
|
|||
#PRODUCT_VENDOR_PROPERTIES += \
|
||||
#config.disable_location=true
|
||||
|
||||
# Enable Perfetto traced
|
||||
# There is a stable property API for this prop so we can move it to /product.
|
||||
# https://android-review.googlesource.com/c/platform/system/libsysprop/+/952375
|
||||
PRODUCT_PRODUCT_PROPERTIES += \
|
||||
persist.traced.enable=1
|
||||
|
||||
# enable Google-specific location features,
|
||||
# like NetworkLocationProvider and LocationCollector
|
||||
PRODUCT_SYSTEM_EXT_PROPERTIES += \
|
||||
|
|
|
|||
|
|
@ -42,12 +42,6 @@ $(call inherit-product-if-exists, device/generic/goldfish/vendor.mk)
|
|||
#PRODUCT_VENDOR_PROPERTIES += \
|
||||
#config.disable_location=true
|
||||
|
||||
# Enable Perfetto traced
|
||||
# There is a stable property API for this prop so we can move it to /product.
|
||||
# https://android-review.googlesource.com/c/platform/system/libsysprop/+/952375
|
||||
PRODUCT_PRODUCT_PROPERTIES += \
|
||||
persist.traced.enable=1
|
||||
|
||||
# enable Google-specific location features,
|
||||
# like NetworkLocationProvider and LocationCollector
|
||||
PRODUCT_SYSTEM_EXT_PROPERTIES += \
|
||||
|
|
|
|||
|
|
@ -25,7 +25,8 @@ PRODUCT_PACKAGES := \
|
|||
|
||||
PRODUCT_PACKAGES += \
|
||||
LiveWallpapersPicker \
|
||||
PhotoTable
|
||||
PhotoTable \
|
||||
preinstalled-packages-platform-full-base.xml
|
||||
|
||||
# Bluetooth:
|
||||
# audio.a2dp.default is a system module. Generic system image includes
|
||||
|
|
|
|||
|
|
@ -93,11 +93,6 @@ PRODUCT_PACKAGES += \
|
|||
libhidltransport \
|
||||
libhwbinder \
|
||||
|
||||
# Camera service uses 'libdepthphoto' for adding dynamic depth
|
||||
# metadata inside depth jpegs.
|
||||
PRODUCT_PACKAGES += \
|
||||
libdepthphoto \
|
||||
|
||||
PRODUCT_PACKAGES_DEBUG += \
|
||||
avbctl \
|
||||
bootctl \
|
||||
|
|
|
|||
|
|
@ -20,7 +20,6 @@
|
|||
# Set lowram options and enable traced by default
|
||||
PRODUCT_VENDOR_PROPERTIES += \
|
||||
ro.config.low_ram=true \
|
||||
persist.traced.enable=1 \
|
||||
|
||||
# Speed profile services and wifi-service to reduce RAM and storage.
|
||||
PRODUCT_SYSTEM_SERVER_COMPILER_FILTER := speed-profile
|
||||
|
|
@ -40,6 +39,7 @@ PRODUCT_ART_TARGET_INCLUDE_DEBUG_BUILD := false
|
|||
# Do not spin up a separate process for the network stack on go devices, use an in-process APK.
|
||||
PRODUCT_PACKAGES += InProcessNetworkStack
|
||||
PRODUCT_PACKAGES += CellBroadcastAppPlatform
|
||||
PRODUCT_PACKAGES += CellBroadcastServiceModulePlatform
|
||||
PRODUCT_PACKAGES += com.android.tethering.inprocess
|
||||
|
||||
# Strip the local variable table and the local variable type table to reduce
|
||||
|
|
|
|||
|
|
@ -0,0 +1,309 @@
|
|||
LLNDK: libEGL.so
|
||||
LLNDK: libGLESv1_CM.so
|
||||
LLNDK: libGLESv2.so
|
||||
LLNDK: libGLESv3.so
|
||||
LLNDK: libRS.so
|
||||
LLNDK: libandroid_net.so
|
||||
LLNDK: libbinder_ndk.so
|
||||
LLNDK: libc.so
|
||||
LLNDK: libcgrouprc.so
|
||||
LLNDK: libdl.so
|
||||
LLNDK: libft2.so
|
||||
LLNDK: liblog.so
|
||||
LLNDK: libm.so
|
||||
LLNDK: libmediandk.so
|
||||
LLNDK: libnativewindow.so
|
||||
LLNDK: libneuralnetworks.so
|
||||
LLNDK: libselinux.so
|
||||
LLNDK: libsync.so
|
||||
LLNDK: libvndksupport.so
|
||||
LLNDK: libvulkan.so
|
||||
VNDK-SP: android.hardware.common-V1-ndk_platform.so
|
||||
VNDK-SP: android.hardware.graphics.common-V1-ndk_platform.so
|
||||
VNDK-SP: android.hardware.graphics.common@1.0.so
|
||||
VNDK-SP: android.hardware.graphics.common@1.1.so
|
||||
VNDK-SP: android.hardware.graphics.common@1.2.so
|
||||
VNDK-SP: android.hardware.graphics.mapper@2.0.so
|
||||
VNDK-SP: android.hardware.graphics.mapper@2.1.so
|
||||
VNDK-SP: android.hardware.graphics.mapper@3.0.so
|
||||
VNDK-SP: android.hardware.graphics.mapper@4.0.so
|
||||
VNDK-SP: android.hardware.renderscript@1.0.so
|
||||
VNDK-SP: android.hidl.memory.token@1.0.so
|
||||
VNDK-SP: android.hidl.memory@1.0-impl.so
|
||||
VNDK-SP: android.hidl.memory@1.0.so
|
||||
VNDK-SP: android.hidl.safe_union@1.0.so
|
||||
VNDK-SP: libRSCpuRef.so
|
||||
VNDK-SP: libRSDriver.so
|
||||
VNDK-SP: libRS_internal.so
|
||||
VNDK-SP: libbacktrace.so
|
||||
VNDK-SP: libbase.so
|
||||
VNDK-SP: libbcinfo.so
|
||||
VNDK-SP: libblas.so
|
||||
VNDK-SP: libc++.so
|
||||
VNDK-SP: libcompiler_rt.so
|
||||
VNDK-SP: libcutils.so
|
||||
VNDK-SP: libgralloctypes.so
|
||||
VNDK-SP: libhardware.so
|
||||
VNDK-SP: libhidlbase.so
|
||||
VNDK-SP: libhidlmemory.so
|
||||
VNDK-SP: libion.so
|
||||
VNDK-SP: libjsoncpp.so
|
||||
VNDK-SP: liblzma.so
|
||||
VNDK-SP: libprocessgroup.so
|
||||
VNDK-SP: libunwindstack.so
|
||||
VNDK-SP: libutils.so
|
||||
VNDK-SP: libutilscallstack.so
|
||||
VNDK-SP: libz.so
|
||||
VNDK-core: android.frameworks.automotive.display@1.0.so
|
||||
VNDK-core: android.frameworks.cameraservice.common@2.0.so
|
||||
VNDK-core: android.frameworks.cameraservice.device@2.0.so
|
||||
VNDK-core: android.frameworks.cameraservice.service@2.0.so
|
||||
VNDK-core: android.frameworks.cameraservice.service@2.1.so
|
||||
VNDK-core: android.frameworks.displayservice@1.0.so
|
||||
VNDK-core: android.frameworks.schedulerservice@1.0.so
|
||||
VNDK-core: android.frameworks.sensorservice@1.0.so
|
||||
VNDK-core: android.frameworks.stats@1.0.so
|
||||
VNDK-core: android.hardware.atrace@1.0.so
|
||||
VNDK-core: android.hardware.audio.common@2.0.so
|
||||
VNDK-core: android.hardware.audio.common@4.0.so
|
||||
VNDK-core: android.hardware.audio.common@5.0.so
|
||||
VNDK-core: android.hardware.audio.common@6.0.so
|
||||
VNDK-core: android.hardware.audio.effect@2.0.so
|
||||
VNDK-core: android.hardware.audio.effect@4.0.so
|
||||
VNDK-core: android.hardware.audio.effect@5.0.so
|
||||
VNDK-core: android.hardware.audio.effect@6.0.so
|
||||
VNDK-core: android.hardware.audio@2.0.so
|
||||
VNDK-core: android.hardware.audio@4.0.so
|
||||
VNDK-core: android.hardware.audio@5.0.so
|
||||
VNDK-core: android.hardware.audio@6.0.so
|
||||
VNDK-core: android.hardware.authsecret@1.0.so
|
||||
VNDK-core: android.hardware.automotive.audiocontrol@1.0.so
|
||||
VNDK-core: android.hardware.automotive.audiocontrol@2.0.so
|
||||
VNDK-core: android.hardware.automotive.can@1.0.so
|
||||
VNDK-core: android.hardware.automotive.evs@1.0.so
|
||||
VNDK-core: android.hardware.automotive.evs@1.1.so
|
||||
VNDK-core: android.hardware.automotive.occupant_awareness-V1-ndk_platform.so
|
||||
VNDK-core: android.hardware.automotive.sv@1.0.so
|
||||
VNDK-core: android.hardware.automotive.vehicle@2.0.so
|
||||
VNDK-core: android.hardware.biometrics.face@1.0.so
|
||||
VNDK-core: android.hardware.biometrics.fingerprint@2.1.so
|
||||
VNDK-core: android.hardware.biometrics.fingerprint@2.2.so
|
||||
VNDK-core: android.hardware.bluetooth.a2dp@1.0.so
|
||||
VNDK-core: android.hardware.bluetooth.audio@2.0.so
|
||||
VNDK-core: android.hardware.bluetooth@1.0.so
|
||||
VNDK-core: android.hardware.bluetooth@1.1.so
|
||||
VNDK-core: android.hardware.boot@1.0.so
|
||||
VNDK-core: android.hardware.boot@1.1.so
|
||||
VNDK-core: android.hardware.broadcastradio@1.0.so
|
||||
VNDK-core: android.hardware.broadcastradio@1.1.so
|
||||
VNDK-core: android.hardware.broadcastradio@2.0.so
|
||||
VNDK-core: android.hardware.camera.common@1.0.so
|
||||
VNDK-core: android.hardware.camera.device@1.0.so
|
||||
VNDK-core: android.hardware.camera.device@3.2.so
|
||||
VNDK-core: android.hardware.camera.device@3.3.so
|
||||
VNDK-core: android.hardware.camera.device@3.4.so
|
||||
VNDK-core: android.hardware.camera.device@3.5.so
|
||||
VNDK-core: android.hardware.camera.device@3.6.so
|
||||
VNDK-core: android.hardware.camera.metadata@3.2.so
|
||||
VNDK-core: android.hardware.camera.metadata@3.3.so
|
||||
VNDK-core: android.hardware.camera.metadata@3.4.so
|
||||
VNDK-core: android.hardware.camera.metadata@3.5.so
|
||||
VNDK-core: android.hardware.camera.provider@2.4.so
|
||||
VNDK-core: android.hardware.camera.provider@2.5.so
|
||||
VNDK-core: android.hardware.camera.provider@2.6.so
|
||||
VNDK-core: android.hardware.cas.native@1.0.so
|
||||
VNDK-core: android.hardware.cas@1.0.so
|
||||
VNDK-core: android.hardware.cas@1.1.so
|
||||
VNDK-core: android.hardware.cas@1.2.so
|
||||
VNDK-core: android.hardware.configstore-utils.so
|
||||
VNDK-core: android.hardware.configstore@1.0.so
|
||||
VNDK-core: android.hardware.configstore@1.1.so
|
||||
VNDK-core: android.hardware.confirmationui-support-lib.so
|
||||
VNDK-core: android.hardware.confirmationui@1.0.so
|
||||
VNDK-core: android.hardware.contexthub@1.0.so
|
||||
VNDK-core: android.hardware.contexthub@1.1.so
|
||||
VNDK-core: android.hardware.drm@1.0.so
|
||||
VNDK-core: android.hardware.drm@1.1.so
|
||||
VNDK-core: android.hardware.drm@1.2.so
|
||||
VNDK-core: android.hardware.drm@1.3.so
|
||||
VNDK-core: android.hardware.dumpstate@1.0.so
|
||||
VNDK-core: android.hardware.dumpstate@1.1.so
|
||||
VNDK-core: android.hardware.fastboot@1.0.so
|
||||
VNDK-core: android.hardware.gatekeeper@1.0.so
|
||||
VNDK-core: android.hardware.gnss.measurement_corrections@1.0.so
|
||||
VNDK-core: android.hardware.gnss.measurement_corrections@1.1.so
|
||||
VNDK-core: android.hardware.gnss.visibility_control@1.0.so
|
||||
VNDK-core: android.hardware.gnss@1.0.so
|
||||
VNDK-core: android.hardware.gnss@1.1.so
|
||||
VNDK-core: android.hardware.gnss@2.0.so
|
||||
VNDK-core: android.hardware.gnss@2.1.so
|
||||
VNDK-core: android.hardware.graphics.allocator@2.0.so
|
||||
VNDK-core: android.hardware.graphics.allocator@3.0.so
|
||||
VNDK-core: android.hardware.graphics.allocator@4.0.so
|
||||
VNDK-core: android.hardware.graphics.bufferqueue@1.0.so
|
||||
VNDK-core: android.hardware.graphics.bufferqueue@2.0.so
|
||||
VNDK-core: android.hardware.graphics.composer@2.1.so
|
||||
VNDK-core: android.hardware.graphics.composer@2.2.so
|
||||
VNDK-core: android.hardware.graphics.composer@2.3.so
|
||||
VNDK-core: android.hardware.graphics.composer@2.4.so
|
||||
VNDK-core: android.hardware.health.storage@1.0.so
|
||||
VNDK-core: android.hardware.health@1.0.so
|
||||
VNDK-core: android.hardware.health@2.0.so
|
||||
VNDK-core: android.hardware.health@2.1.so
|
||||
VNDK-core: android.hardware.identity-V2-ndk_platform.so
|
||||
VNDK-core: android.hardware.input.classifier@1.0.so
|
||||
VNDK-core: android.hardware.input.common@1.0.so
|
||||
VNDK-core: android.hardware.ir@1.0.so
|
||||
VNDK-core: android.hardware.keymaster-V2-ndk_platform.so
|
||||
VNDK-core: android.hardware.keymaster@3.0.so
|
||||
VNDK-core: android.hardware.keymaster@4.0.so
|
||||
VNDK-core: android.hardware.keymaster@4.1.so
|
||||
VNDK-core: android.hardware.light-V1-ndk_platform.so
|
||||
VNDK-core: android.hardware.light@2.0.so
|
||||
VNDK-core: android.hardware.media.bufferpool@1.0.so
|
||||
VNDK-core: android.hardware.media.bufferpool@2.0.so
|
||||
VNDK-core: android.hardware.media.c2@1.0.so
|
||||
VNDK-core: android.hardware.media.c2@1.1.so
|
||||
VNDK-core: android.hardware.media.omx@1.0.so
|
||||
VNDK-core: android.hardware.media@1.0.so
|
||||
VNDK-core: android.hardware.memtrack@1.0.so
|
||||
VNDK-core: android.hardware.neuralnetworks@1.0.so
|
||||
VNDK-core: android.hardware.neuralnetworks@1.1.so
|
||||
VNDK-core: android.hardware.neuralnetworks@1.2.so
|
||||
VNDK-core: android.hardware.neuralnetworks@1.3.so
|
||||
VNDK-core: android.hardware.nfc@1.0.so
|
||||
VNDK-core: android.hardware.nfc@1.1.so
|
||||
VNDK-core: android.hardware.nfc@1.2.so
|
||||
VNDK-core: android.hardware.oemlock@1.0.so
|
||||
VNDK-core: android.hardware.power-V1-ndk_platform.so
|
||||
VNDK-core: android.hardware.power.stats@1.0.so
|
||||
VNDK-core: android.hardware.power@1.0.so
|
||||
VNDK-core: android.hardware.power@1.1.so
|
||||
VNDK-core: android.hardware.power@1.2.so
|
||||
VNDK-core: android.hardware.power@1.3.so
|
||||
VNDK-core: android.hardware.radio.config@1.0.so
|
||||
VNDK-core: android.hardware.radio.config@1.1.so
|
||||
VNDK-core: android.hardware.radio.config@1.2.so
|
||||
VNDK-core: android.hardware.radio.deprecated@1.0.so
|
||||
VNDK-core: android.hardware.radio@1.0.so
|
||||
VNDK-core: android.hardware.radio@1.1.so
|
||||
VNDK-core: android.hardware.radio@1.2.so
|
||||
VNDK-core: android.hardware.radio@1.3.so
|
||||
VNDK-core: android.hardware.radio@1.4.so
|
||||
VNDK-core: android.hardware.radio@1.5.so
|
||||
VNDK-core: android.hardware.rebootescrow-V1-ndk_platform.so
|
||||
VNDK-core: android.hardware.secure_element@1.0.so
|
||||
VNDK-core: android.hardware.secure_element@1.1.so
|
||||
VNDK-core: android.hardware.secure_element@1.2.so
|
||||
VNDK-core: android.hardware.sensors@1.0.so
|
||||
VNDK-core: android.hardware.sensors@2.0.so
|
||||
VNDK-core: android.hardware.sensors@2.1.so
|
||||
VNDK-core: android.hardware.soundtrigger@2.0-core.so
|
||||
VNDK-core: android.hardware.soundtrigger@2.0.so
|
||||
VNDK-core: android.hardware.soundtrigger@2.1.so
|
||||
VNDK-core: android.hardware.soundtrigger@2.2.so
|
||||
VNDK-core: android.hardware.soundtrigger@2.3.so
|
||||
VNDK-core: android.hardware.tetheroffload.config@1.0.so
|
||||
VNDK-core: android.hardware.tetheroffload.control@1.0.so
|
||||
VNDK-core: android.hardware.thermal@1.0.so
|
||||
VNDK-core: android.hardware.thermal@1.1.so
|
||||
VNDK-core: android.hardware.thermal@2.0.so
|
||||
VNDK-core: android.hardware.tv.cec@1.0.so
|
||||
VNDK-core: android.hardware.tv.cec@2.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.gadget@1.1.so
|
||||
VNDK-core: android.hardware.usb@1.0.so
|
||||
VNDK-core: android.hardware.usb@1.1.so
|
||||
VNDK-core: android.hardware.usb@1.2.so
|
||||
VNDK-core: android.hardware.vibrator-V1-ndk_platform.so
|
||||
VNDK-core: android.hardware.vibrator@1.0.so
|
||||
VNDK-core: android.hardware.vibrator@1.1.so
|
||||
VNDK-core: android.hardware.vibrator@1.2.so
|
||||
VNDK-core: android.hardware.vibrator@1.3.so
|
||||
VNDK-core: android.hardware.vr@1.0.so
|
||||
VNDK-core: android.hardware.weaver@1.0.so
|
||||
VNDK-core: android.hardware.wifi.hostapd@1.0.so
|
||||
VNDK-core: android.hardware.wifi.hostapd@1.1.so
|
||||
VNDK-core: android.hardware.wifi.hostapd@1.2.so
|
||||
VNDK-core: android.hardware.wifi.offload@1.0.so
|
||||
VNDK-core: android.hardware.wifi.supplicant@1.0.so
|
||||
VNDK-core: android.hardware.wifi.supplicant@1.1.so
|
||||
VNDK-core: android.hardware.wifi.supplicant@1.2.so
|
||||
VNDK-core: android.hardware.wifi.supplicant@1.3.so
|
||||
VNDK-core: android.hardware.wifi@1.0.so
|
||||
VNDK-core: android.hardware.wifi@1.1.so
|
||||
VNDK-core: android.hardware.wifi@1.2.so
|
||||
VNDK-core: android.hardware.wifi@1.3.so
|
||||
VNDK-core: android.hardware.wifi@1.4.so
|
||||
VNDK-core: android.hidl.allocator@1.0.so
|
||||
VNDK-core: android.hidl.memory.block@1.0.so
|
||||
VNDK-core: android.hidl.token@1.0-utils.so
|
||||
VNDK-core: android.hidl.token@1.0.so
|
||||
VNDK-core: android.system.net.netd@1.0.so
|
||||
VNDK-core: android.system.net.netd@1.1.so
|
||||
VNDK-core: android.system.suspend@1.0.so
|
||||
VNDK-core: android.system.wifi.keystore@1.0.so
|
||||
VNDK-core: libadf.so
|
||||
VNDK-core: libaudioroute.so
|
||||
VNDK-core: libaudioutils.so
|
||||
VNDK-core: libbinder.so
|
||||
VNDK-core: libbufferqueueconverter.so
|
||||
VNDK-core: libcamera_metadata.so
|
||||
VNDK-core: libcap.so
|
||||
VNDK-core: libcn-cbor.so
|
||||
VNDK-core: libcodec2.so
|
||||
VNDK-core: libcrypto.so
|
||||
VNDK-core: libcrypto_utils.so
|
||||
VNDK-core: libcurl.so
|
||||
VNDK-core: libdiskconfig.so
|
||||
VNDK-core: libdumpstateutil.so
|
||||
VNDK-core: libevent.so
|
||||
VNDK-core: libexif.so
|
||||
VNDK-core: libexpat.so
|
||||
VNDK-core: libfmq.so
|
||||
VNDK-core: libgatekeeper.so
|
||||
VNDK-core: libgui.so
|
||||
VNDK-core: libhardware_legacy.so
|
||||
VNDK-core: libhidlallocatorutils.so
|
||||
VNDK-core: libjpeg.so
|
||||
VNDK-core: libldacBT_abr.so
|
||||
VNDK-core: libldacBT_enc.so
|
||||
VNDK-core: liblz4.so
|
||||
VNDK-core: libmedia_helper.so
|
||||
VNDK-core: libmedia_omx.so
|
||||
VNDK-core: libmemtrack.so
|
||||
VNDK-core: libminijail.so
|
||||
VNDK-core: libmkbootimg_abi_check.so
|
||||
VNDK-core: libnetutils.so
|
||||
VNDK-core: libnl.so
|
||||
VNDK-core: libpcre2.so
|
||||
VNDK-core: libpiex.so
|
||||
VNDK-core: libpng.so
|
||||
VNDK-core: libpower.so
|
||||
VNDK-core: libprocinfo.so
|
||||
VNDK-core: libradio_metadata.so
|
||||
VNDK-core: libspeexresampler.so
|
||||
VNDK-core: libsqlite.so
|
||||
VNDK-core: libssl.so
|
||||
VNDK-core: libstagefright_bufferpool@2.0.so
|
||||
VNDK-core: libstagefright_bufferqueue_helper.so
|
||||
VNDK-core: libstagefright_foundation.so
|
||||
VNDK-core: libstagefright_omx.so
|
||||
VNDK-core: libstagefright_omx_utils.so
|
||||
VNDK-core: libstagefright_xmlparser.so
|
||||
VNDK-core: libsysutils.so
|
||||
VNDK-core: libtinyalsa.so
|
||||
VNDK-core: libtinyxml2.so
|
||||
VNDK-core: libui.so
|
||||
VNDK-core: libusbhost.so
|
||||
VNDK-core: libwifi-system-iface.so
|
||||
VNDK-core: libxml2.so
|
||||
VNDK-core: libyuv.so
|
||||
VNDK-core: libziparchive.so
|
||||
VNDK-private: libbacktrace.so
|
||||
VNDK-private: libblas.so
|
||||
VNDK-private: libcompiler_rt.so
|
||||
VNDK-private: libft2.so
|
||||
VNDK-private: libgui.so
|
||||
|
|
@ -26,6 +26,7 @@ VNDK-SP: android.hardware.graphics.common@1.2.so
|
|||
VNDK-SP: android.hardware.graphics.mapper@2.0.so
|
||||
VNDK-SP: android.hardware.graphics.mapper@2.1.so
|
||||
VNDK-SP: android.hardware.graphics.mapper@3.0.so
|
||||
VNDK-SP: android.hardware.graphics.mapper@4.0.so
|
||||
VNDK-SP: android.hardware.renderscript@1.0.so
|
||||
VNDK-SP: android.hidl.memory.token@1.0.so
|
||||
VNDK-SP: android.hidl.memory@1.0-impl.so
|
||||
|
|
@ -41,6 +42,7 @@ VNDK-SP: libblas.so
|
|||
VNDK-SP: libc++.so
|
||||
VNDK-SP: libcompiler_rt.so
|
||||
VNDK-SP: libcutils.so
|
||||
VNDK-SP: libgralloctypes.so
|
||||
VNDK-SP: libhardware.so
|
||||
VNDK-SP: libhidlbase.so
|
||||
VNDK-SP: libhidlmemory.so
|
||||
|
|
@ -53,12 +55,14 @@ VNDK-SP: libutils.so
|
|||
VNDK-SP: libutilscallstack.so
|
||||
VNDK-SP: libz.so
|
||||
VNDK-core: android.hardware.audio.common@2.0.so
|
||||
VNDK-core: android.hardware.automotive.occupant_awareness-V1-ndk_platform.so
|
||||
VNDK-core: android.hardware.configstore-utils.so
|
||||
VNDK-core: android.hardware.configstore@1.0.so
|
||||
VNDK-core: android.hardware.configstore@1.1.so
|
||||
VNDK-core: android.hardware.confirmationui-support-lib.so
|
||||
VNDK-core: android.hardware.graphics.allocator@2.0.so
|
||||
VNDK-core: android.hardware.graphics.allocator@3.0.so
|
||||
VNDK-core: android.hardware.graphics.allocator@4.0.so
|
||||
VNDK-core: android.hardware.graphics.bufferqueue@1.0.so
|
||||
VNDK-core: android.hardware.graphics.bufferqueue@2.0.so
|
||||
VNDK-core: android.hardware.identity-V2-ndk_platform.so
|
||||
|
|
@ -69,6 +73,7 @@ VNDK-core: android.hardware.media.omx@1.0.so
|
|||
VNDK-core: android.hardware.media@1.0.so
|
||||
VNDK-core: android.hardware.memtrack@1.0.so
|
||||
VNDK-core: android.hardware.power-V1-ndk_platform.so
|
||||
VNDK-core: android.hardware.rebootescrow-V1-ndk_platform.so
|
||||
VNDK-core: android.hardware.soundtrigger@2.0-core.so
|
||||
VNDK-core: android.hardware.soundtrigger@2.0.so
|
||||
VNDK-core: android.hardware.vibrator-V1-ndk_platform.so
|
||||
|
|
@ -79,6 +84,7 @@ VNDK-core: libadf.so
|
|||
VNDK-core: libaudioroute.so
|
||||
VNDK-core: libaudioutils.so
|
||||
VNDK-core: libbinder.so
|
||||
VNDK-core: libbufferqueueconverter.so
|
||||
VNDK-core: libcamera_metadata.so
|
||||
VNDK-core: libcap.so
|
||||
VNDK-core: libcn-cbor.so
|
||||
|
|
|
|||
|
|
@ -46,11 +46,16 @@ TARGET_FLATTEN_APEX := false
|
|||
# GSI targets should install "flattened" APEXes in /system_ext as well
|
||||
PRODUCT_INSTALL_EXTRA_FLATTENED_APEXES := true
|
||||
|
||||
# The flattened version of com.android.apex.cts.shim.v1 should be explicitly installed
|
||||
# because the shim apex is prebuilt one and PRODUCT_INSTALL_EXTRA_FLATTENED_APEXES is not
|
||||
# supported for prebuilt_apex modules yet.
|
||||
PRODUCT_PACKAGES += com.android.apex.cts.shim.v1_with_prebuilts.flattened
|
||||
|
||||
# GSI specific tasks on boot
|
||||
PRODUCT_PACKAGES += \
|
||||
gsi_skip_mount.cfg \
|
||||
init.gsi.rc \
|
||||
init.vndk-nodef.rc \
|
||||
|
||||
# Support additional P and Q VNDK packages
|
||||
PRODUCT_EXTRA_VNDK_VERSIONS := 28 29
|
||||
# Support additional P, Q and R VNDK packages
|
||||
PRODUCT_EXTRA_VNDK_VERSIONS := 28 29 30
|
||||
|
|
|
|||
|
|
@ -31,6 +31,7 @@ PRODUCT_PACKAGES += \
|
|||
LatinIME \
|
||||
Music \
|
||||
OneTimeInitializer \
|
||||
preinstalled-packages-platform-handheld-product.xml \
|
||||
QuickSearchBox \
|
||||
SettingsIntelligence \
|
||||
frameworks-base-overlays
|
||||
|
|
|
|||
|
|
@ -53,10 +53,9 @@ PRODUCT_PACKAGES += \
|
|||
librs_jni \
|
||||
ManagedProvisioning \
|
||||
MmsService \
|
||||
MtpDocumentsProvider \
|
||||
MtpService \
|
||||
MusicFX \
|
||||
NfcNci \
|
||||
OsuLogin \
|
||||
PacProcessor \
|
||||
PrintRecommendationService \
|
||||
PrintSpooler \
|
||||
|
|
|
|||
|
|
@ -0,0 +1,18 @@
|
|||
# Copyright (C) 2020 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.
|
||||
#
|
||||
|
||||
# Disable Camera pinner by default
|
||||
PRODUCT_PRODUCT_PROPERTIES += \
|
||||
pinner.pin_camera=false
|
||||
|
|
@ -52,12 +52,13 @@ endif
|
|||
PRODUCT_SYSTEM_SERVER_JARS := \
|
||||
com.android.location.provider \
|
||||
services \
|
||||
ethernet-service \
|
||||
wifi-service \
|
||||
ethernet-service
|
||||
|
||||
# system server jars which are updated via apex modules.
|
||||
# The values should be of the format <apex name>:<jar name>
|
||||
PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS := \
|
||||
com.android.permission:service-permission \
|
||||
com.android.wifi:service-wifi \
|
||||
com.android.ipsec:android.net.ipsec.ike \
|
||||
|
||||
PRODUCT_COPY_FILES += \
|
||||
|
|
|
|||
|
|
@ -92,8 +92,8 @@ PRODUCT_SYSTEM_PROPERTIES += \
|
|||
dalvik.vm.minidebuginfo=true \
|
||||
dalvik.vm.dex2oat-minidebuginfo=true
|
||||
|
||||
# Disable iorapd by default
|
||||
# Enable iorapd by default
|
||||
PRODUCT_SYSTEM_PROPERTIES += \
|
||||
ro.iorapd.enable=false
|
||||
ro.iorapd.enable=true
|
||||
|
||||
PRODUCT_USES_DEFAULT_ART_CONFIG := true
|
||||
|
|
|
|||
|
|
@ -0,0 +1,33 @@
|
|||
// Copyright (C} 2019 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.
|
||||
|
||||
prebuilt_etc {
|
||||
name: "preinstalled-packages-platform-aosp-product.xml",
|
||||
product_specific: true,
|
||||
sub_dir: "sysconfig",
|
||||
src: "preinstalled-packages-platform-aosp-product.xml",
|
||||
}
|
||||
|
||||
prebuilt_etc {
|
||||
name: "preinstalled-packages-platform-full-base.xml",
|
||||
sub_dir: "sysconfig",
|
||||
src: "preinstalled-packages-platform-full-base.xml",
|
||||
}
|
||||
|
||||
prebuilt_etc {
|
||||
name: "preinstalled-packages-platform-handheld-product.xml",
|
||||
product_specific: true,
|
||||
sub_dir: "sysconfig",
|
||||
src: "preinstalled-packages-platform-handheld-product.xml",
|
||||
}
|
||||
|
|
@ -0,0 +1,23 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Copyright (C) 2019 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.
|
||||
-->
|
||||
<!-- System packages to preinstall on all devices with aosp_product, per user type.
|
||||
Documentation at frameworks/base/data/etc/preinstalled-packages-platform.xml
|
||||
-->
|
||||
<config>
|
||||
<install-in-user-type package="com.android.wallpaperpicker">
|
||||
<install-in user-type="FULL" />
|
||||
</install-in-user-type>
|
||||
</config>
|
||||
|
|
@ -0,0 +1,23 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Copyright (C) 2019 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.
|
||||
-->
|
||||
<!-- System packages to preinstall on all devices with full_base, per user type.
|
||||
Documentation at frameworks/base/data/etc/preinstalled-packages-platform.xml
|
||||
-->
|
||||
<config>
|
||||
<install-in-user-type package="com.android.wallpaper.livepicker">
|
||||
<install-in user-type="FULL" />
|
||||
</install-in-user-type>
|
||||
</config>
|
||||
|
|
@ -0,0 +1,23 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Copyright (C) 2019 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.
|
||||
-->
|
||||
<!-- System packages to preinstall on all devices with handheld_product, per user type.
|
||||
Documentation at frameworks/base/data/etc/preinstalled-packages-platform.xml
|
||||
-->
|
||||
<config>
|
||||
<install-in-user-type package="com.android.wallpapercropper">
|
||||
<install-in user-type="FULL" />
|
||||
</install-in-user-type>
|
||||
</config>
|
||||
|
|
@ -21,7 +21,7 @@ PRODUCT_PACKAGES := \
|
|||
ONS \
|
||||
CarrierDefaultApp \
|
||||
CallLogBackup \
|
||||
CellBroadcastApp \
|
||||
CellBroadcastServiceModule \
|
||||
com.android.cellbroadcast \
|
||||
CellBroadcastLegacyApp \
|
||||
|
||||
PRODUCT_COPY_FILES := \
|
||||
|
|
|
|||
|
|
@ -17,6 +17,8 @@
|
|||
# Inherit this when the target needs to support updating APEXes
|
||||
|
||||
ifneq ($(OVERRIDE_TARGET_FLATTEN_APEX),true)
|
||||
# com.android.apex.cts.shim.v1_prebuilt overrides CtsShimPrebuilt
|
||||
# and CtsShimPrivPrebuilt since they are packaged inside the APEX.
|
||||
PRODUCT_PACKAGES += com.android.apex.cts.shim.v1_prebuilt
|
||||
PRODUCT_VENDOR_PROPERTIES := ro.apex.updatable=true
|
||||
TARGET_FLATTEN_APEX := false
|
||||
|
|
|
|||
|
|
@ -11,7 +11,8 @@ echo "ro.build.version.preview_sdk=$PLATFORM_PREVIEW_SDK_VERSION"
|
|||
echo "ro.build.version.preview_sdk_fingerprint=$PLATFORM_PREVIEW_SDK_FINGERPRINT"
|
||||
echo "ro.build.version.codename=$PLATFORM_VERSION_CODENAME"
|
||||
echo "ro.build.version.all_codenames=$PLATFORM_VERSION_ALL_CODENAMES"
|
||||
echo "ro.build.version.release=$PLATFORM_VERSION"
|
||||
echo "ro.build.version.release=$PLATFORM_VERSION_LAST_STABLE"
|
||||
echo "ro.build.version.release_or_codename=$PLATFORM_VERSION"
|
||||
echo "ro.build.version.security_patch=$PLATFORM_SECURITY_PATCH"
|
||||
echo "ro.build.version.base_os=$PLATFORM_BASE_OS"
|
||||
echo "ro.build.version.min_supported_target_sdk=$PLATFORM_MIN_SUPPORTED_TARGET_SDK_VERSION"
|
||||
|
|
|
|||
|
|
@ -41,6 +41,7 @@ import com.android.apksig.Hints;
|
|||
import com.android.apksig.apk.ApkUtils;
|
||||
import com.android.apksig.apk.MinSdkVersionException;
|
||||
import com.android.apksig.util.DataSink;
|
||||
import com.android.apksig.util.DataSource;
|
||||
import com.android.apksig.util.DataSources;
|
||||
import com.android.apksig.zip.ZipFormatException;
|
||||
|
||||
|
|
@ -57,6 +58,7 @@ import java.io.IOException;
|
|||
import java.io.InputStream;
|
||||
import java.io.InputStreamReader;
|
||||
import java.io.OutputStream;
|
||||
import java.io.RandomAccessFile;
|
||||
import java.lang.reflect.Constructor;
|
||||
import java.nio.ByteBuffer;
|
||||
import java.nio.ByteOrder;
|
||||
|
|
@ -1021,9 +1023,10 @@ class SignApk {
|
|||
"[-providerClass <className>] " +
|
||||
"[--min-sdk-version <n>] " +
|
||||
"[--disable-v2] " +
|
||||
"[--enable-v4] " +
|
||||
"publickey.x509[.pem] privatekey.pk8 " +
|
||||
"[publickey2.x509[.pem] privatekey2.pk8 ...] " +
|
||||
"input.jar output.jar");
|
||||
"input.jar output.jar [output-v4-file]");
|
||||
System.exit(2);
|
||||
}
|
||||
|
||||
|
|
@ -1043,6 +1046,7 @@ class SignApk {
|
|||
int alignment = 4;
|
||||
Integer minSdkVersionOverride = null;
|
||||
boolean signUsingApkSignatureSchemeV2 = true;
|
||||
boolean signUsingApkSignatureSchemeV4 = false;
|
||||
SigningCertificateLineage certLineage = null;
|
||||
|
||||
int argstart = 0;
|
||||
|
|
@ -1071,6 +1075,9 @@ class SignApk {
|
|||
} else if ("--disable-v2".equals(args[argstart])) {
|
||||
signUsingApkSignatureSchemeV2 = false;
|
||||
++argstart;
|
||||
} else if ("--enable-v4".equals(args[argstart])) {
|
||||
signUsingApkSignatureSchemeV4 = true;
|
||||
++argstart;
|
||||
} else if ("--lineage".equals(args[argstart])) {
|
||||
File lineageFile = new File(args[++argstart]);
|
||||
try {
|
||||
|
|
@ -1085,8 +1092,14 @@ class SignApk {
|
|||
}
|
||||
}
|
||||
|
||||
if ((args.length - argstart) % 2 == 1) usage();
|
||||
int numKeys = ((args.length - argstart) / 2) - 1;
|
||||
int numArgsExcludeV4FilePath;
|
||||
if (signUsingApkSignatureSchemeV4) {
|
||||
numArgsExcludeV4FilePath = args.length - 1;
|
||||
} else {
|
||||
numArgsExcludeV4FilePath = args.length;
|
||||
}
|
||||
if ((numArgsExcludeV4FilePath - argstart) % 2 == 1) usage();
|
||||
int numKeys = ((numArgsExcludeV4FilePath - argstart) / 2) - 1;
|
||||
if (signWholeFile && numKeys > 1) {
|
||||
System.err.println("Only one key may be used with -w.");
|
||||
System.exit(2);
|
||||
|
|
@ -1094,8 +1107,12 @@ class SignApk {
|
|||
|
||||
loadProviderIfNecessary(providerClass);
|
||||
|
||||
String inputFilename = args[args.length-2];
|
||||
String outputFilename = args[args.length-1];
|
||||
String inputFilename = args[numArgsExcludeV4FilePath - 2];
|
||||
String outputFilename = args[numArgsExcludeV4FilePath - 1];
|
||||
String outputV4Filename = "";
|
||||
if (signUsingApkSignatureSchemeV4) {
|
||||
outputV4Filename = args[args.length - 1];
|
||||
}
|
||||
|
||||
JarFile inputJar = null;
|
||||
FileOutputStream outputFile = null;
|
||||
|
|
@ -1233,6 +1250,13 @@ class SignApk {
|
|||
outputFile.close();
|
||||
outputFile = null;
|
||||
apkSigner.outputDone();
|
||||
|
||||
if (signUsingApkSignatureSchemeV4) {
|
||||
final DataSource outputApkIn = DataSources.asDataSource(
|
||||
new RandomAccessFile(new File(outputFilename), "r"));
|
||||
final File outputV4File = new File(outputV4Filename);
|
||||
apkSigner.signV4(outputApkIn, outputV4File, false /* ignore failures */);
|
||||
}
|
||||
}
|
||||
|
||||
return;
|
||||
|
|
|
|||
|
|
@ -102,6 +102,7 @@ project_list = [
|
|||
create_pattern('ndk'),
|
||||
# match vendor/unbungled_google/packages before other packages
|
||||
create_pattern('unbundled_google'),
|
||||
create_pattern('packages/providers/MediaProvider'),
|
||||
create_pattern('packages'),
|
||||
create_pattern('pdk'),
|
||||
create_pattern('prebuilts'),
|
||||
|
|
|
|||
Loading…
Reference in New Issue