diff options
19 files changed, 84 insertions, 7 deletions
diff --git a/core/Makefile b/core/Makefile index c9b8cd11fb..6c90b51fcb 100644 --- a/core/Makefile +++ b/core/Makefile @@ -597,16 +597,32 @@ $(INSTALLED_ODM_BUILD_PROP_TARGET): $(BUILDINFO_COMMON_SH) $(POST_PROCESS_PROPS) INSTALLED_SYSTEM_EXT_BUILD_PROP_TARGET := $(TARGET_OUT_SYSTEM_EXT)/build.prop ALL_DEFAULT_INSTALLED_MODULES += $(INSTALLED_SYSTEM_EXT_BUILD_PROP_TARGET) +ifdef TARGET_SYSTEM_EXT_PROP +system_ext_prop_files := $(TARGET_SYSTEM_EXT_PROP) +else +system_ext_prop_files := $(wildcard $(TARGET_DEVICE_DIR)/system_ext.prop) +endif + FINAL_SYSTEM_EXT_PROPERTIES += \ $(call collapse-pairs, $(PRODUCT_SYSTEM_EXT_PROPERTIES)) FINAL_SYSTEM_EXT_PROPERTIES := $(call uniq-pairs-by-first-component, \ $(FINAL_SYSTEM_EXT_PROPERTIES),=) -$(INSTALLED_SYSTEM_EXT_BUILD_PROP_TARGET): $(BUILDINFO_COMMON_SH) $(POST_PROCESS_PROPS) +$(INSTALLED_SYSTEM_EXT_BUILD_PROP_TARGET): $(BUILDINFO_COMMON_SH) $(POST_PROCESS_PROPS) $(system_ext_prop_files) @echo Target system_ext buildinfo: $@ @mkdir -p $(dir $@) $(hide) echo > $@ $(hide) $(call generate-common-build-props,system_ext,$@) + $(hide) $(foreach file,$(system_ext_prop_files), \ + if [ -f "$(file)" ]; then \ + echo Target system_ext properties from: "$(file)"; \ + echo "" >> $@; \ + echo "#" >> $@; \ + echo "# from $(file)" >> $@; \ + echo "#" >> $@; \ + cat $(file) >> $@; \ + echo "# end of $(file)" >> $@; \ + fi;) $(hide) echo "#" >> $@; \ echo "# ADDITIONAL SYSTEM_EXT BUILD PROPERTIES" >> $@; \ echo "#" >> $@; diff --git a/core/java_common.mk b/core/java_common.mk index a23d92d9f6..dfe75f3257 100644 --- a/core/java_common.mk +++ b/core/java_common.mk @@ -86,6 +86,8 @@ ifeq ($(LOCAL_PROTOC_OPTIMIZE_TYPE),micro) $(proto_java_srcjar): $(HOST_OUT_EXECUTABLES)/protoc-gen-javamicro else ifeq ($(LOCAL_PROTOC_OPTIMIZE_TYPE),nano) $(proto_java_srcjar): PRIVATE_PROTO_JAVA_OUTPUT_OPTION := --javanano_out + $(proto_java_srcjar): PRIVATE_PROTOC_FLAGS += --plugin=$(HOST_OUT_EXECUTABLES)/protoc-gen-javanano + $(proto_java_srcjar): $(HOST_OUT_EXECUTABLES)/protoc-gen-javanano else ifeq ($(LOCAL_PROTOC_OPTIMIZE_TYPE),stream) $(proto_java_srcjar): PRIVATE_PROTO_JAVA_OUTPUT_OPTION := --javastream_out $(proto_java_srcjar): PRIVATE_PROTOC_FLAGS += --plugin=$(HOST_OUT_EXECUTABLES)/protoc-gen-javastream diff --git a/core/proguard_basic_keeps.flags b/core/proguard_basic_keeps.flags index a0f577d8ba..28ec2d043f 100644 --- a/core/proguard_basic_keeps.flags +++ b/core/proguard_basic_keeps.flags @@ -72,3 +72,7 @@ # Less spammy. -dontnote + +# The lite proto runtime uses reflection to access fields based on the names in +# the schema, keep all the fields. +-keepclassmembers class * extends com.google.protobuf.MessageLite { <fields>; } diff --git a/target/board/BoardConfigGsiCommon.mk b/target/board/BoardConfigGsiCommon.mk index 31d0bdf215..4c783c0f3a 100644 --- a/target/board/BoardConfigGsiCommon.mk +++ b/target/board/BoardConfigGsiCommon.mk @@ -41,9 +41,9 @@ BOARD_AVB_SYSTEM_ROLLBACK_INDEX_LOCATION := 1 # GSI specific System Properties ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT))) -TARGET_SYSTEM_PROP := build/make/target/board/gsi_system.prop +TARGET_SYSTEM_EXT_PROP := build/make/target/board/gsi_system_ext.prop else -TARGET_SYSTEM_PROP := build/make/target/board/gsi_system_user.prop +TARGET_SYSTEM_EXT_PROP := build/make/target/board/gsi_system_ext_user.prop endif # Set this to create /cache mount point for non-A/B devices that mounts /cache. diff --git a/target/board/generic/system.prop b/target/board/generic/system_ext.prop index ad8e5b806e..ad8e5b806e 100644 --- a/target/board/generic/system.prop +++ b/target/board/generic/system_ext.prop diff --git a/target/board/generic_arm64/system.prop b/target/board/generic_arm64/system_ext.prop index 5b0183a37c..5b0183a37c 100644 --- a/target/board/generic_arm64/system.prop +++ b/target/board/generic_arm64/system_ext.prop diff --git a/target/board/generic_x86/system.prop b/target/board/generic_x86/system_ext.prop index 64829f3ce4..64829f3ce4 100644 --- a/target/board/generic_x86/system.prop +++ b/target/board/generic_x86/system_ext.prop diff --git a/target/board/generic_x86_64/system.prop b/target/board/generic_x86_64/system_ext.prop index ed9d1731c7..ed9d1731c7 100644 --- a/target/board/generic_x86_64/system.prop +++ b/target/board/generic_x86_64/system_ext.prop diff --git a/target/board/generic_x86_arm/system.prop b/target/board/generic_x86_arm/system_ext.prop index 64829f3ce4..64829f3ce4 100644 --- a/target/board/generic_x86_arm/system.prop +++ b/target/board/generic_x86_arm/system_ext.prop diff --git a/target/board/gsi_system.prop b/target/board/gsi_system_ext.prop index dd3227efb2..dd3227efb2 100644 --- a/target/board/gsi_system.prop +++ b/target/board/gsi_system_ext.prop diff --git a/target/board/gsi_system_user.prop b/target/board/gsi_system_ext_user.prop index db6d880b7a..db6d880b7a 100644 --- a/target/board/gsi_system_user.prop +++ b/target/board/gsi_system_ext_user.prop diff --git a/target/product/base_system.mk b/target/product/base_system.mk index 2ef104bd40..44fc7e45db 100644 --- a/target/product/base_system.mk +++ b/target/product/base_system.mk @@ -270,8 +270,6 @@ PRODUCT_PACKAGES += \ viewcompiler \ voip-common \ vold \ - vndkcore.libraries.txt \ - vndkprivate.libraries.txt \ WallpaperBackup \ watchdogd \ wificond \ diff --git a/target/product/base_vendor.mk b/target/product/base_vendor.mk index 1e1effb538..f3705ea656 100644 --- a/target/product/base_vendor.mk +++ b/target/product/base_vendor.mk @@ -75,3 +75,7 @@ PRODUCT_PACKAGES += \ # VINTF data for vendor image PRODUCT_PACKAGES += \ device_compatibility_matrix.xml \ + +PRODUCT_PACKAGES += \ + libprotobuf-cpp-lite-vendorcompat \ + libprotobuf-cpp-full-vendorcompat \ diff --git a/target/product/go_defaults_common.mk b/target/product/go_defaults_common.mk index 7b9c783334..d4655f1f00 100644 --- a/target/product/go_defaults_common.mk +++ b/target/product/go_defaults_common.mk @@ -39,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 # Strip the local variable table and the local variable type table to reduce # the size of the system image. This has no bearing on stack traces, but will diff --git a/target/product/gsi/Android.mk b/target/product/gsi/Android.mk index 54f41ca947..1987c9c27a 100644 --- a/target/product/gsi/Android.mk +++ b/target/product/gsi/Android.mk @@ -150,6 +150,8 @@ ifneq ($(TARGET_SKIP_CURRENT_VNDK),true) LOCAL_REQUIRED_MODULES += \ llndk.libraries.txt \ vndksp.libraries.txt \ + vndkcore.libraries.txt \ + vndkprivate.libraries.txt \ $(addsuffix .vendor,$(VNDK_CORE_LIBRARIES)) \ $(addsuffix .vendor,$(VNDK_SAMEPROCESS_LIBRARIES)) endif diff --git a/target/product/sdk_phone_x86.mk b/target/product/sdk_phone_x86.mk index b3e205c0d6..efb3c6e705 100644 --- a/target/product/sdk_phone_x86.mk +++ b/target/product/sdk_phone_x86.mk @@ -14,6 +14,29 @@ # limitations under the License. # QEMU_USE_SYSTEM_EXT_PARTITIONS := true +PRODUCT_USE_DYNAMIC_PARTITIONS := true + +# +# All components inherited here go to system image +# +$(call inherit-product, $(SRC_TARGET_DIR)/product/mainline_system.mk) + +# Enable mainline checking for excat this product name +ifeq (sdk_phone_x86,$(TARGET_PRODUCT)) +PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed +endif + +# +# All components inherited here go to product image +# +$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_product.mk) + +# +# All components inherited here go to vendor image +# +$(call inherit-product-if-exists, device/generic/goldfish/x86-vendor.mk) +$(call inherit-product, $(SRC_TARGET_DIR)/product/emulator_vendor.mk) +$(call inherit-product, $(SRC_TARGET_DIR)/board/generic_x86/device.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_x86.mk) diff --git a/target/product/sdk_phone_x86_64.mk b/target/product/sdk_phone_x86_64.mk index 8062459248..267796f39c 100644 --- a/target/product/sdk_phone_x86_64.mk +++ b/target/product/sdk_phone_x86_64.mk @@ -14,8 +14,33 @@ # limitations under the License. # QEMU_USE_SYSTEM_EXT_PARTITIONS := true +PRODUCT_USE_DYNAMIC_PARTITIONS := true -$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_x86_64.mk) +# +# All components inherited here go to system image +# +$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk) +$(call inherit-product, $(SRC_TARGET_DIR)/product/mainline_system.mk) + +# Enable mainline checking for excat this product name +ifeq (sdk_phone_x86_64,$(TARGET_PRODUCT)) +PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed +endif + +PRODUCT_ARTIFACT_PATH_REQUIREMENT_WHITELIST += \ + root/init.zygote64_32.rc \ + +# +# All components inherited here go to product image +# +$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_product.mk) + +# +# All components inherited here go to vendor image +# +$(call inherit-product-if-exists, device/generic/goldfish/x86_64-vendor.mk) +$(call inherit-product, $(SRC_TARGET_DIR)/product/emulator_vendor.mk) +$(call inherit-product, $(SRC_TARGET_DIR)/board/generic_x86_64/device.mk) # Define the host tools and libs that are parts of the SDK. -include sdk/build/product_sdk.mk diff --git a/target/product/telephony_system.mk b/target/product/telephony_system.mk index 584cf1ee63..4da9bdfb47 100644 --- a/target/product/telephony_system.mk +++ b/target/product/telephony_system.mk @@ -21,6 +21,6 @@ PRODUCT_PACKAGES := \ ONS \ CarrierDefaultApp \ CallLogBackup \ - CellBroadcastReceiver \ + CellBroadcastAppPlatform \ PRODUCT_COPY_FILES := \ diff --git a/tools/fs_config/fs_config_generator.py b/tools/fs_config/fs_config_generator.py index 2956b1121a..1405fd3bc5 100755 --- a/tools/fs_config/fs_config_generator.py +++ b/tools/fs_config/fs_config_generator.py @@ -1066,6 +1066,8 @@ class FSConfigGen(BaseGenerator): path = fs_config.path if self._partition == 'system': + if not self._all_partitions: + return True for skip_partition in self._all_partitions.split(','): if path.startswith(skip_partition) or path.startswith( 'system/' + skip_partition): |