android/device_phh_treble
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Move vndk include in generate.sh, to only include vndk32 in arm

Browse Source
This commit is contained in:
Pierre-Hugues Husson 2018-05-18 13:49:04 +02:00
parent eafd73a5e2
commit 36e63f8a80
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
base.mk
View File

@ -11,7 +11,6 @@ PRODUCT_COPY_FILES += \
BOARD_PLAT_PRIVATE_SEPOLICY_DIR += device/phh/treble/sepolicy BOARD_PLAT_PRIVATE_SEPOLICY_DIR += device/phh/treble/sepolicy
DEVICE_PACKAGE_OVERLAYS += device/phh/treble/overlay DEVICE_PACKAGE_OVERLAYS += device/phh/treble/overlay
$(call inherit-product, vendor/vndk/vndk.mk)
$(call inherit-product, vendor/hardware_overlay/overlay.mk) $(call inherit-product, vendor/hardware_overlay/overlay.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk)

5
generate.sh
View File

@ -15,6 +15,7 @@ for part in a ab;do
apps_script="" apps_script=""
apps_name="" apps_name=""
extra_packages="" extra_packages=""
vndk="vndk.mk"
if [ "$apps" == "gapps" ];then if [ "$apps" == "gapps" ];then
apps_suffix="g" apps_suffix="g"
apps_script='$(call inherit-product, device/phh/treble/gapps.mk)' apps_script='$(call inherit-product, device/phh/treble/gapps.mk)'
@ -35,6 +36,9 @@ for part in a ab;do
apps_script='' apps_script=''
apps_name="vanilla" apps_name="vanilla"
fi fi
if [ "$arch" == "arm" ];then
vndk="vndk32.mk"
fi
su_suffix='N' su_suffix='N'
if [ "$su" == "yes" ];then if [ "$su" == "yes" ];then
@ -52,6 +56,7 @@ for part in a ab;do
cat > ${target}.mk << EOF cat > ${target}.mk << EOF
\$(call inherit-product, device/phh/treble/base-pre.mk) \$(call inherit-product, device/phh/treble/base-pre.mk)
include build/make/target/product/treble_common.mk include build/make/target/product/treble_common.mk
\$(call inherit-product, vendor/vndk/${vndk})
\$(call inherit-product, device/phh/treble/base.mk) \$(call inherit-product, device/phh/treble/base.mk)
$apps_script $apps_script
$rom_script $rom_script