Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a1188f61 authored by Xin Li's avatar Xin Li
Browse files

Merge Android 12 

Bug: 202323961
Merged-In: I291da39a81666a7bbd001a685d1db12c84e4d31c
Change-Id: If480657962daa2337bd215a4af6f226d4a711213
parents 634b07a8 5821c67d

Android.bp

+9 −0
Original line number Diff line number Diff line
@@ -33,3 +33,12 @@ license { 
    ],

    // large-scale-change unable to identify any license_text files

}



vintf_compatibility_matrix {

    name: "redfin_product_compatibility_matrix.xml",

    stem: "compatibility_matrix.redfin.xml",

    product_specific: true,

    srcs: [

        "device_framework_matrix_product.xml",

    ],

}

AndroidProducts.mk

+3 −0
Original line number Diff line number Diff line
@@ -16,7 +16,10 @@ 


PRODUCT_MAKEFILES := \

    $(LOCAL_DIR)/aosp_redfin.mk \

    $(LOCAL_DIR)/aosp_redfin_64.mk \

    $(LOCAL_DIR)/vf/aosp_redfin_vf.mk \

    $(LOCAL_DIR)/aosp_redfin_hwasan.mk \



COMMON_LUNCH_CHOICES := \

    aosp_redfin-userdebug \

    aosp_redfin_vf-userdebug \

CleanSpec.mk

+8 −0
Original line number Diff line number Diff line
@@ -48,3 +48,11 @@ 
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/etc/init/android.hardware.vibrator@1.3-service.redfin.rc)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/bin/hw/android.hardware.vibrator@1.3-service.redfin)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/etc/vintf/manifest/android.hardware.vibrator@1.3-service.redfin.xml)



# Update to USB HAL 1.3

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/bin/hw/android.hardware.usb@1.2-service.redfin)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/etc/init/android.hardware.usb@1.2-service.redfin.rc)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/etc/vintf/manifest/android.hardware.usb@1.2-service.redfin.xml)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/bin/hw/android.hardware.usb@1.3-service.redfin)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/etc/init/android.hardware.usb@1.3-service.redfin.rc)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/etc/vintf/manifest/android.hardware.usb@1.3-service.redfin.xml)

METADATA

0 → 100644
+3 −0
Original line number Diff line number Diff line 
third_party {

  license_type: NOTICE

}

aosp_redfin.mk

+9 −3
Original line number Diff line number Diff line
@@ -17,8 +17,12 @@ 
#

# All components inherited here go to system image

#

ifeq (,$(filter %_64,$(TARGET_PRODUCT)))

$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)

$(call inherit-product, $(SRC_TARGET_DIR)/product/mainline_system.mk)

else

$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit_only.mk)

endif

$(call inherit-product, $(SRC_TARGET_DIR)/product/generic_system.mk)



# Enable mainline checking

PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := strict
@@ -49,11 +53,13 @@ $(call inherit-product-if-exists, vendor/google_devices/redfin/prebuilts/device- 
PRODUCT_COPY_FILES += \

    frameworks/native/data/etc/aosp_excluded_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/aosp_excluded_hardware.xml



# Keep the VNDK APEX in /system partition for REL branches as these branches are

# expected to have stable API/ABI surfaces.

# Keep the VNDK APEX in /system partition for REL branches and Vendor Freeze targets

# as these are expected to have stable API/ABI surfaces.

ifneq (REL,$(PLATFORM_VERSION_CODENAME))

ifneq ($(PRODUCT_VENDOR_FREEZE_SYSTEM_BUILD),true)

  PRODUCT_PACKAGES += com.android.vndk.current.on_vendor

endif

endif



# Don't build super.img.

PRODUCT_BUILD_SUPER_PARTITION := false