Pārlūkot izejas kodu

For new build arrangement

Change-Id: Id40c96a190ef9537264e9b6b5201f8808eed017f
Chuanzhou 1 gadu atpakaļ
vecāks
revīzija
1b6b152b16

+ 1 - 11
BoardConfigCommon.mk

@@ -14,20 +14,14 @@
 # limitations under the License.
 #
 
--include device/thead/common/os_version.mk
 
 TARGET_ARCH := riscv64
 TARGET_CPU_ABI := riscv64
 
-ifeq ($(BUILD_AOSP_MASTER), true)
 TARGET_ARCH_VARIANT :=
 TARGET_CPU_VARIANT := generic
 
-else
-TARGET_ARCH_VARIANT := riscv64-xtheadc
-TARGET_CPU_VARIANT := c910
-TARGET_CPU_VARIANT_RUNTIME := c910
-endif
+-include vendor/thead/proprietary/config/arch/th1520.mk
 
 TARGET_USERIMAGES_USE_EXT4 := true
 BOARD_VNDK_VERSION := current
@@ -72,9 +66,5 @@ BOARD_SUPER_IMAGE_IN_UPDATE_PACKAGE := true
 
 BOARD_USES_METADATA_PARTITION := true
 
-
-# FIXME remove prebuilts/vndk/31, it conflicts with packages/modules/vndk
-BUILD_BROKEN_DUP_RULES := true
-
 BOARD_SEPOLICY_DIRS += device/thead/th1520/sepolicy/vendor
 BOARD_ROOT_EXTRA_SYMLINKS += /vendor/firmware:/lib/firmware

+ 0 - 6
subdevs/camera/camera.mk

@@ -1,9 +1,3 @@
-# thead base camera modules
-PRODUCT_PACKAGES += \
-    android.hardware.camera.provider@2.5-service-thead \
-    libthead_camera_core \
-    libyaml
-
 # odm must make their media_profiles_V1_0.xml to odm/etc
 PRODUCT_COPY_FILES += \
     device/thead/th1520/subdevs/camera/media_profiles.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_V1_0.xml \

+ 0 - 62
subdevs/graphics/graphics.mk

@@ -20,65 +20,3 @@ PRODUCT_PACKAGES += \
     android.hardware.memtrack@1.0-service \
     android.hardware.memtrack@1.0-impl
 
-PREBUILT_GPU_BGM := true
-
-# Add gpu bxm binary
-PRODUCT_PACKAGES += \
-    ocl_unit_test \
-    pdump \
-    pvr_memory_test \
-    pvr_mutex_perf_test_mx \
-    pvrdebug \
-    pvrhtb2txt \
-    pvrhtbd \
-    pvrhwperf \
-    pvrlogdump \
-    pvrlogsplit \
-    pvrsrvctl \
-    pvrtld \
-    rgx_blit_test \
-    rgx_compute_test \
-    rgx_kicksync_test \
-    rgx_triangle_test \
-    rgx_twiddling_test \
-    testwrap \
-
-# Add gpu bxm lib
-PRODUCT_PACKAGES += \
-    libEGL_powervr \
-    libGLESv1_CM_powervr \
-    libGLESv2_powervr \
-    hwcomposer.th1520 \
-    gralloc.th1520 \
-    vulkan.th1520 \
-    libIMGegl \
-    libPVROCL \
-    libPVRScopeServices \
-    libcreatesurface \
-    libglslcompiler \
-    libpvrANDROID_WSEGL \
-    libsrv_um \
-    libsutu_display \
-    libufwriter \
-    libusc \
-
-# Opengles version
-PRODUCT_VENDOR_PROPERTIES += \
-    ro.hardware.egl=powervr  \
-    ro.opengles.version=196610
-
-# Add gpu bxm test apks
-PRODUCT_PACKAGES += \
-    eglinfo \
-    gles1test1 \
-    gles2test1 \
-    gles3test1\
-    hal_blit_test \
-    launcher \
-    tearing_test \
-    vkbonjour
-
-# GPU copy files
-PRODUCT_COPY_FILES += \
-    vendor/thead/prebuilt/gpu_bxm/firmware/rgx.fw.36.52.104.182:$(TARGET_COPY_OUT_VENDOR)/firmware/rgx.fw.36.52.104.182 \
-    vendor/thead/prebuilt/gpu_bxm/firmware/rgx.sh.36.52.104.182:$(TARGET_COPY_OUT_VENDOR)/firmware/rgx.sh.36.52.104.182 \

+ 0 - 8
subdevs/media/media.mk

@@ -1,8 +0,0 @@
-
-# omx&vpu
-PRODUCT_PACKAGES += \
-    vsi_vidmem \
-    libhantro_omx_core \
-    libOMX.hantro.G2.video.decoder \
-    libOMX.hantro.H2.video.encoder\
-    libstagefrighthw \

+ 0 - 9
subdevs/nna/nna.mk

@@ -1,9 +0,0 @@
-PRODUCT_PACKAGES += \
-	libimgcustom \
-	libnnaruntime \
-	neuralnetworks_img_nna_sl_driver_hw_prebuilt \
-	android.hardware.neuralnetworks-shim-service-img-nn-hw \
-	basic-debug \
-	hwconfig.json \
-	mapconfig.json
-

+ 7 - 6
th1520-common.mk

@@ -1,12 +1,8 @@
--include device/thead/common/os_version.mk
-
 TARGET_BOARD_PLATFORM := th1520
-PRODUCT_USE_DYNAMIC_PARTITIONS := true
 
-include device/thead/th1520/subdevs/boot/boot.mk
+$(call inherit-product, vendor/thead/proprietary/config/chipset/th1520/th1520.mk)
 
 include device/thead/th1520/subdevs/graphics/graphics.mk
-include device/thead/th1520/subdevs/nna/nna.mk
 include device/thead/th1520/subdevs/security/security.mk
 include device/thead/th1520/subdevs/updater/updater.mk
 include device/thead/th1520/subdevs/performance/performance.mk
@@ -16,6 +12,7 @@ include device/thead/th1520/subdevs/media/media.mk
 include device/thead/th1520/subdevs/connectivity/connectivity.mk
 
 PRODUCT_SHIPPING_API_LEVEL := 31
+PRODUCT_CHARACTERISTICS := tablet
 
 # FIXME API_LEVEL 32 required manifest fcm verison ge 6
 # but now is 3
@@ -43,6 +40,10 @@ PRODUCT_PACKAGES += \
     modetest
 endif
 
+ifeq ($(TARGET_PREBUILT_KERNEL_MODULES), )
 KERNEL_MODULE_DIR := device/thead/th1520-kernel
-BOARD_VENDOR_KERNEL_MODULES := $(wildcard $(KERNEL_MODULE_DIR)/*.ko)
+else
+KERNEL_MODULE_DIR := $(TARGET_PREBUILT_KERNEL_MODULES)
+endif
 
+BOARD_VENDOR_KERNEL_MODULES := $(wildcard $(KERNEL_MODULE_DIR)/*.ko)