Browse Source

For new build arrangement

Change-Id: I92657f2c2b62bae2538588d9a3e3d1ee098d8dec
Chuanzhou 1 year ago
parent
commit
4b0adc80fa
4 changed files with 19 additions and 26 deletions
  1. 1 21
      aosp_common.mk
  2. 3 0
      aosp_vendor.mk
  3. 0 5
      os_version.mk
  4. 15 0
      system_riscv_patch.mk

+ 1 - 21
aosp_common.mk

@@ -13,8 +13,7 @@
 # # limitations under the License.
 # #
 
--include device/thead/common/os_version.mk
-
+PRODUCT_USE_DYNAMIC_PARTITIONS := true
 #
 # All components inherited here go to system image
 #
@@ -23,26 +22,7 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit_only.mk)
 # Enable CSI checking
 PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed
 
-ifeq ($(BUILD_AOSP_MASTER), true)
-# Workaround for AOSP mainline
-ALLOW_MISSING_DEPENDENCIES := true
-PRODUCT_USE_DYNAMIC_PARTITIONS := true
-PRODUCT_USES_DEFAULT_ART_CONFIG := false
-
-$(call inherit-product, $(SRC_TARGET_DIR)/product/generic_system.mk)
-
-PRODUCT_PROPERTY_OVERRIDES += \
-    dalvik.vm.usejit=false
-
-PRODUCT_SYSTEM_PROPERTIES += \
-    config.disable_renderscript=1 \
-
-PRODUCT_ARTIFACT_PATH_REQUIREMENT_ALLOWED_LIST += \
-    root/init.zygote64.rc
-
-else
 $(call inherit-product, $(SRC_TARGET_DIR)/product/generic_system.mk)
-endif
 
 #
 # All components inherited here go to system_ext image

+ 3 - 0
aosp_vendor.mk

@@ -1,5 +1,8 @@
 # AOSP default vendor configs
 
+# DRM service opt-in
+PRODUCT_VENDOR_PROPERTIES += drm.service.enabled=true
+
 # Enable Incremental Delivery V2 features for CtsInstalledLoadingProgressHostTests
 PRODUCT_PROPERTY_OVERRIDES += ro.incremental.enable=yes
 

+ 0 - 5
os_version.mk

@@ -1,5 +0,0 @@
-ifeq ($(call math_gt,$(PLATFORM_VERSION_LAST_STABLE),12),true)
-  BUILD_AOSP_MASTER := true
-else
-  BUILD_AOSP_MASTER :=
-endif

+ 15 - 0
system_riscv_patch.mk

@@ -4,3 +4,18 @@ PRODUCT_PACKAGES += libcompiler_rt
 PRODUCT_ARTIFACT_PATH_REQUIREMENT_ALLOWED_LIST += \
     system/lib64/libcompiler_rt.so \
 
+ifneq ($(call math_gt,$(PLATFORM_VERSION_LAST_STABLE),12),true)
+# Workaround for AOSP mainline
+ALLOW_MISSING_DEPENDENCIES := true
+PRODUCT_USES_DEFAULT_ART_CONFIG := false
+
+PRODUCT_PROPERTY_OVERRIDES += \
+    dalvik.vm.usejit=false
+
+PRODUCT_SYSTEM_PROPERTIES += \
+    config.disable_renderscript=1 \
+
+PRODUCT_ARTIFACT_PATH_REQUIREMENT_ALLOWED_LIST += \
+    root/init.zygote64.rc
+endif
+