Merge "Remove SOONG, SOONG_BUILD_NINJA, SOONG_IN_MAKE and SOONG_BOOTSTRAP." am: 5569faae37 am: 19bddeb6f6 am: de89004658
Original change: https://android-review.googlesource.com/c/platform/build/+/1507481
Change-Id: I49f7450f28c472288c4331fbe8c8eec6c8212fe8
diff --git a/CleanSpec.mk b/CleanSpec.mk
index 41defb2..497047b 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -744,7 +744,7 @@
$(call add-clean-step, rm -rf $(HOST_OUT)/framework/vts-core-tradefed.jar)
$(call add-clean-step, rm -rf $(HOST_OUT)/vts10/*)
$(call add-clean-step, rm -rf $(HOST_OUT)/framework/vts10-tradefed.jar)
-# Clean up VTS again as VTS-Core will be renamed to VTS
+# Clean up VTS again as VTS-Core will be renamed to VTS
$(call add-clean-step, rm -rf $(HOST_OUT)/vts/*)
$(call add-clean-step, rm -rf $(HOST_OUT)/framework/vts-tradefed.jar)
diff --git a/core/Makefile b/core/Makefile
index a53944c..d85bd76 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -5031,7 +5031,7 @@
$(PROFDATA_ZIP): $(SOONG_ZIP)
$(hide) $(SOONG_ZIP) -d -o $@ -C $(LLVM_PREBUILTS_BASE)/linux-x86/$(LLVM_PREBUILTS_VERSION) -f $(LLVM_PROFDATA) -f $(LIBCXX)
- $(call dist-for-goals,droidcore,$(PROFDATA_ZIP))
+ $(call dist-for-goals,droidcore apps_only,$(PROFDATA_ZIP))
endif
# -----------------------------------------------------------------
diff --git a/core/board_config.mk b/core/board_config.mk
index d674d1a..53daf26 100644
--- a/core/board_config.mk
+++ b/core/board_config.mk
@@ -53,6 +53,7 @@
TARGET_NO_RADIOIMAGE \
TARGET_HARDWARE_3D \
WITH_DEXPREOPT \
+ AB_OTA_PARTITIONS \
# File system variables
_board_strip_readonly_list += \
diff --git a/core/build_id.mk b/core/build_id.mk
index 11f4a80..2f9c3f3 100644
--- a/core/build_id.mk
+++ b/core/build_id.mk
@@ -18,4 +18,4 @@
# (like "CRB01"). It must be a single word, and is
# capitalized by convention.
-BUILD_ID=RVC
+BUILD_ID=MASTER
diff --git a/target/board/go_defaults_common.prop b/target/board/go_defaults_common.prop
index d4989e0..ec2eb63 100644
--- a/target/board/go_defaults_common.prop
+++ b/target/board/go_defaults_common.prop
@@ -21,7 +21,6 @@
ro.lmk.upgrade_pressure=40
ro.lmk.downgrade_pressure=60
ro.lmk.kill_heaviest_task=false
-ro.statsd.enable=true
# set threshold to filter unused apps
pm.dexopt.downgrade_after_inactive_days=10
diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index 4d92db7..299ebe0 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -16,6 +16,7 @@
# Base modules and settings for the system partition.
PRODUCT_PACKAGES += \
+ abx \
adbd_system_api \
am \
android.hidl.allocator@1.0-service \
@@ -27,7 +28,6 @@
android.test.base \
android.test.mock \
android.test.runner \
- ANGLE \
apexd \
appops \
app_process \
@@ -50,6 +50,7 @@
charger \
cmd \
com.android.adbd \
+ com.android.appsearch \
com.android.conscrypt \
com.android.cronet \
com.android.extservices \
@@ -83,6 +84,7 @@
e2fsck \
ExtShared \
flags_health_check \
+ framework-graphics \
framework-minus-apex \
framework-res \
framework-sysconfig.xml \
@@ -121,6 +123,7 @@
credstore \
ld.mc \
libaaudio \
+ libalarm_jni \
libamidi \
libandroid \
libandroidfw \
@@ -184,7 +187,6 @@
libstagefright_foundation \
libstagefright_omx \
libstdc++ \
- libsurfaceflinger \
libsysutils \
libui \
libusbhost \
@@ -208,6 +210,7 @@
media_profiles_V1_0.dtd \
MediaProviderLegacy \
mediaserver \
+ mediatranscoding \
mke2fs \
monkey \
mtpd \
@@ -264,6 +267,7 @@
tune2fs \
tzdatacheck \
uiautomator \
+ uinput \
uncrypt \
usbd \
vdc \
@@ -331,6 +335,7 @@
PRODUCT_BOOT_JARS := \
$(ART_APEX_JARS) \
framework-minus-apex \
+ framework-graphics \
ext \
com.android.i18n:core-icu4j \
telephony-common \
@@ -338,6 +343,7 @@
ims-common
PRODUCT_UPDATABLE_BOOT_JARS := \
+ com.android.appsearch:framework-appsearch \
com.android.conscrypt:conscrypt \
com.android.media:updatable-media \
com.android.mediaprovider:framework-mediaprovider \
@@ -368,7 +374,8 @@
PRODUCT_SYSTEM_PROPERTIES += debug.atrace.tags.enableflags=0
PRODUCT_SYSTEM_PROPERTIES += persist.traced.enable=1
-PRODUCT_PROPERTY_OVERRIDES += ro.gfx.angle.supported=true
+# ANGLE is not enabled by default
+PRODUCT_PROPERTY_OVERRIDES += ro.gfx.angle.supported=false
# Packages included only for eng or userdebug builds, previously debug tagged
PRODUCT_PACKAGES_DEBUG := \
diff --git a/target/product/base_vendor.mk b/target/product/base_vendor.mk
index b955841..07b3361 100644
--- a/target/product/base_vendor.mk
+++ b/target/product/base_vendor.mk
@@ -57,6 +57,7 @@
libdynproc \
libeffectproxy \
libeffects \
+ libhapticgenerator \
libldnhncr \
libreference-ril \
libreverbwrapper \
diff --git a/target/product/cfi-common.mk b/target/product/cfi-common.mk
index 82f53f6..773e4f4 100644
--- a/target/product/cfi-common.mk
+++ b/target/product/cfi-common.mk
@@ -33,7 +33,7 @@
system/bt \
system/chre \
system/core/libnetutils \
- system/core/libziparchive \
+ system/libziparchive \
system/gatekeeper \
system/keymaster \
system/nfc \
diff --git a/target/product/emulator_vendor.mk b/target/product/emulator_vendor.mk
index 89c3f3a..74e5e8c 100644
--- a/target/product/emulator_vendor.mk
+++ b/target/product/emulator_vendor.mk
@@ -49,4 +49,4 @@
# disable setupwizard
PRODUCT_SYSTEM_EXT_PROPERTIES += \
- ro.setupwizard.mode=DISABLED
+ ro.setupwizard.mode?=DISABLED
diff --git a/target/product/generic_system.mk b/target/product/generic_system.mk
index 9580ade..f07e883 100644
--- a/target/product/generic_system.mk
+++ b/target/product/generic_system.mk
@@ -36,7 +36,6 @@
RcsService \
Stk \
Tag \
- TimeZoneUpdater \
# OTA support
PRODUCT_PACKAGES += \
diff --git a/target/product/generic_system_arm64.mk b/target/product/generic_system_arm64.mk
index 2c64479..0fc7803 100644
--- a/target/product/generic_system_arm64.mk
+++ b/target/product/generic_system_arm64.mk
@@ -38,6 +38,8 @@
PRODUCT_SHIPPING_API_LEVEL := 29
+PRODUCT_RESTRICT_VENDOR_FILES := all
+
PRODUCT_NAME := generic_system_arm64
PRODUCT_DEVICE := mainline_arm64
PRODUCT_BRAND := generic
diff --git a/target/product/generic_system_x86.mk b/target/product/generic_system_x86.mk
index cf38a98..21555d4 100644
--- a/target/product/generic_system_x86.mk
+++ b/target/product/generic_system_x86.mk
@@ -37,6 +37,8 @@
PRODUCT_SHIPPING_API_LEVEL := 29
+PRODUCT_RESTRICT_VENDOR_FILES := all
+
PRODUCT_NAME := generic_system_x86
PRODUCT_DEVICE := mainline_x86
PRODUCT_BRAND := generic
diff --git a/target/product/generic_system_x86_64.mk b/target/product/generic_system_x86_64.mk
index 5f3829b..1ca9678 100644
--- a/target/product/generic_system_x86_64.mk
+++ b/target/product/generic_system_x86_64.mk
@@ -38,6 +38,8 @@
PRODUCT_SHIPPING_API_LEVEL := 29
+PRODUCT_RESTRICT_VENDOR_FILES := all
+
PRODUCT_NAME := generic_system_x86_64
PRODUCT_DEVICE := mainline_x86_64
PRODUCT_BRAND := generic
diff --git a/target/product/generic_system_x86_arm.mk b/target/product/generic_system_x86_arm.mk
index 923f32d..fe78f3b 100644
--- a/target/product/generic_system_x86_arm.mk
+++ b/target/product/generic_system_x86_arm.mk
@@ -37,6 +37,8 @@
PRODUCT_SHIPPING_API_LEVEL := 29
+PRODUCT_RESTRICT_VENDOR_FILES := all
+
PRODUCT_NAME := generic_system_x86_arm
PRODUCT_DEVICE := mainline_x86_arm
PRODUCT_BRAND := generic
diff --git a/target/product/gsi/current.txt b/target/product/gsi/current.txt
index 9c08e5e..8451190 100644
--- a/target/product/gsi/current.txt
+++ b/target/product/gsi/current.txt
@@ -62,6 +62,7 @@
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.gnss-V1-ndk_platform.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
@@ -76,6 +77,7 @@
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.power.stats-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
@@ -84,7 +86,6 @@
VNDK-core: android.hidl.token@1.0.so
VNDK-core: android.system.keystore2-V1-ndk_platform.so
VNDK-core: android.system.suspend@1.0.so
-VNDK-core: libadf.so
VNDK-core: libaudioroute.so
VNDK-core: libaudioutils.so
VNDK-core: libbinder.so
diff --git a/target/product/media_system.mk b/target/product/media_system.mk
index 4ebec51..a76125b 100644
--- a/target/product/media_system.mk
+++ b/target/product/media_system.mk
@@ -57,6 +57,7 @@
# 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.appsearch:service-appsearch \
com.android.permission:service-permission \
com.android.ipsec:android.net.ipsec.ike \
