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

Don't include sas stuff on non-sas target

Browse Source
This commit is contained in:
Pierre-Hugues Husson 2019-09-26 22:24:54 +02:00
parent fdf58ff7ed
commit a1527b0b28
3 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
base-sas.mk Normal file
View File

@ -0,0 +1,13 @@
PRODUCT_COPY_FILES += \
device/phh/treble/apex-setup.rc:system/etc/init/apex-setup.rc \
PRODUCT_COPY_FILES += \
system/core/rootdir/init.zygote32.rc:system/etc/init/zygote/init.zygote32.rc \
system/core/rootdir/init.zygote32_64.rc:system/etc/init/zygote/init.zygote32_64.rc \
system/core/rootdir/init.zygote64_32.rc:system/etc/init/zygote/init.zygote64_32.rc \
system/core/rootdir/init.zygote64.rc:system/etc/init/zygote/init.zygote64.rc \
PRODUCT_COPY_FILES += \
frameworks/av/apex/mediaswcodec.rc:system/etc/init/mediaswcodec-treble.rc \
device/phh/treble/environ/init.treble-environ.rc:system/etc/init/init.treble-environ.rc \

13
base.mk
View File

@ -140,19 +140,6 @@ PRODUCT_COPY_FILES += \
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \
frameworks/native/data/etc/android.software.secure_lock_screen.xml:system/etc/permissions/android.software.secure_lock_screen.xml \ frameworks/native/data/etc/android.software.secure_lock_screen.xml:system/etc/permissions/android.software.secure_lock_screen.xml \
PRODUCT_COPY_FILES += \
device/phh/treble/apex-setup.rc:system/etc/init/apex-setup.rc \
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \
device/phh/treble/ld.config.26.txt:system/etc/ld.config.26.txt \ device/phh/treble/ld.config.26.txt:system/etc/ld.config.26.txt \
PRODUCT_COPY_FILES += \
system/core/rootdir/init.zygote32.rc:system/etc/init/zygote/init.zygote32.rc \
system/core/rootdir/init.zygote32_64.rc:system/etc/init/zygote/init.zygote32_64.rc \
system/core/rootdir/init.zygote64_32.rc:system/etc/init/zygote/init.zygote64_32.rc \
system/core/rootdir/init.zygote64.rc:system/etc/init/zygote/init.zygote64.rc \
PRODUCT_COPY_FILES += \
frameworks/av/apex/mediaswcodec.rc:system/etc/init/mediaswcodec-treble.rc \
device/phh/treble/environ/init.treble-environ.rc:system/etc/init/init.treble-environ.rc \

4
generate.sh
View File

@ -23,6 +23,7 @@ for part in a ab;do
apps_name="" apps_name=""
extra_packages="" extra_packages=""
vndk="vndk.mk" vndk="vndk.mk"
optional_base=""
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)'
@ -59,6 +60,8 @@ for part in a ab;do
part_suffix='a' part_suffix='a'
if [ "$part" == 'ab' ];then if [ "$part" == 'ab' ];then
part_suffix='b' part_suffix='b'
else
optional_base='$(call inherit-product, device/phh/treble/base-sas.mk)'
fi fi
target="treble_${arch}_${part_suffix}${apps_suffix}${su_suffix}" target="treble_${arch}_${part_suffix}${apps_suffix}${su_suffix}"
@ -78,6 +81,7 @@ for part in a ab;do
include build/make/target/product/aosp_${baseArch}_ab.mk include build/make/target/product/aosp_${baseArch}_ab.mk
\$(call inherit-product, vendor/vndk/${vndk}) \$(call inherit-product, vendor/vndk/${vndk})
\$(call inherit-product, device/phh/treble/base.mk) \$(call inherit-product, device/phh/treble/base.mk)
$optional_base
$apps_script $apps_script
$rom_script $rom_script