StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Stop using build/target -> build/make/target symlink

Browse Source 
Instead, fully specify build/make/target/... everywhere

Test: treehugger
Change-Id: Idf89b2e6a0b777adbfb6370ea34f35faee6d4965
This commit is contained in:
Dan Willemsen
2019-04-09 21:35:37 -07:00
parent f1f33dc1dd
commit 0ab1be6fe2
15 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
target/board/generic_arm64/BoardConfig.mk
View File

@@ -67,7 +67,7 @@ BOARD_ROOT_EXTRA_SYMLINKS += /vendor/firmware_mnt:/firmware
# TODO(b/36764215): remove this setting when the generic system image
# no longer has QCOM-specific directories under /.
BOARD_SEPOLICY_DIRS += build/target/board/generic_arm64_ab/sepolicy
BOARD_SEPOLICY_DIRS += build/make/target/board/generic_arm64_ab/sepolicy
# Wifi.
BOARD_WLAN_DEVICE := emulator

2
target/board/generic_arm64_ab/BoardConfig.mk
View File

@@ -36,4 +36,4 @@ BOARD_ROOT_EXTRA_SYMLINKS += /vendor/firmware_mnt/verinfo:/firmware/verinfo
# TODO(b/36764215): remove this setting when the generic system image
# no longer has QCOM-specific directories under /.
BOARD_SEPOLICY_DIRS += build/target/board/generic_arm64_ab/sepolicy
BOARD_SEPOLICY_DIRS += build/make/target/board/generic_arm64_ab/sepolicy

2
target/board/generic_arm_ab/BoardConfig.mk
View File

@@ -33,4 +33,4 @@ BOARD_ROOT_EXTRA_SYMLINKS += /vendor/firmware_mnt/verinfo:/firmware/verinfo
# TODO(b/36764215): remove this setting when the generic system image
# no longer has QCOM-specific directories under /.
BOARD_SEPOLICY_DIRS += build/target/board/generic_arm64_ab/sepolicy
BOARD_SEPOLICY_DIRS += build/make/target/board/generic_arm64_ab/sepolicy

2
target/board/gsi_arm64/BoardConfig.mk
View File

@@ -34,4 +34,4 @@ BOARD_ROOT_EXTRA_SYMLINKS += /vendor/firmware_mnt:/firmware
# TODO(b/36764215): remove this setting when the generic system image
# no longer has QCOM-specific directories under /.
BOARD_SEPOLICY_DIRS += build/target/board/generic_arm64_ab/sepolicy
BOARD_SEPOLICY_DIRS += build/make/target/board/generic_arm64_ab/sepolicy

2
target/product/go_defaults.mk
View File

@@ -15,5 +15,5 @@
#
# Inherit common Android Go defaults.
$(call inherit-product, build/target/product/go_defaults_common.mk)
$(call inherit-product, build/make/target/product/go_defaults_common.mk)

2
target/product/go_defaults_512.mk
View File

@@ -15,7 +15,7 @@
#
# Inherit common Android Go defaults.
$(call inherit-product, build/target/product/go_defaults_common.mk)
$(call inherit-product, build/make/target/product/go_defaults_common.mk)
# 512MB specific properties.

4
target/product/profile_boot_common.mk
View File

@@ -19,7 +19,7 @@
# remove classes that are no longer in use.
# Ideally we would just generate an empty boot.art but we don't have the build
# support to separate the image from the compile code.
PRODUCT_DEX_PREOPT_BOOT_IMAGE_PROFILE_LOCATION := build/target/product/empty-profile
PRODUCT_DEX_PREOPT_BOOT_IMAGE_PROFILE_LOCATION := build/make/target/product/empty-profile
PRODUCT_DEX_PREOPT_BOOT_FLAGS := --count-hotness-in-compiled-code
DEX_PREOPT_DEFAULT := nostripping
@@ -28,7 +28,7 @@ DONT_UNCOMPRESS_PRIV_APPS_DEXS := true
# Use an empty preloaded-classes list.
PRODUCT_COPY_FILES += \
build/target/product/empty-preloaded-classes:system/etc/preloaded-classes
build/make/target/product/empty-preloaded-classes:system/etc/preloaded-classes
# Boot image property overrides.
PRODUCT_PROPERTY_OVERRIDES += \

2
target/product/security/README
View File

@@ -31,7 +31,7 @@ extracting public keys for embedding
dumpkey.jar is a Java tool that takes an x.509 certificate in PEM format as
input and prints a C structure to standard output:
$ java -jar out/host/linux-x86/framework/dumpkey.jar build/target/product/security/testkey.x509.pem
$ java -jar out/host/linux-x86/framework/dumpkey.jar build/make/target/product/security/testkey.x509.pem
{64,0xc926ad21,{1795090719,2141396315,950055447,2581568430,4268923165,1920809988,546586521,3498997798,1776797858,3740060814,1805317999,1429410244,129622599,1422441418,1783893377,1222374759,2563319927,323993566,28517732,609753416,1826472888,215237850,4261642700,4049082591,3228462402,774857746,154822455,2497198897,2758199418,3019015328,2794777644,87251430,2534927978,120774784,571297800,3695899472,2479925187,3811625450,3401832990,2394869647,3267246207,950095497,555058928,414729973,1136544882,3044590084,465547824,4058146728,2731796054,1689838846,3890756939,1048029507,895090649,247140249,178744550,3547885223,3165179243,109881576,3944604415,1044303212,3772373029,2985150306,3737520932,3599964420},{3437017481,3784475129,2800224972,3086222688,251333580,2131931323,512774938,325948880,2657486437,2102694287,3820568226,792812816,1026422502,2053275343,2800889200,3113586810,165549746,4273519969,4065247892,1902789247,772932719,3941848426,3652744109,216871947,3164400649,1942378755,3996765851,1055777370,964047799,629391717,2232744317,3910558992,191868569,2758883837,3682816752,2997714732,2702529250,3570700455,3776873832,3924067546,3555689545,2758825434,1323144535,61311905,1997411085,376844204,213777604,4077323584,9135381,1625809335,2804742137,2952293945,1117190829,4237312782,1825108855,3013147971,1111251351,2568837572,1684324211,2520978805,367251975,810756730,2353784344,1175080310}}
This is called by build/make/core/Makefile to incorporate the OTA signing keys

2
target/product/verity.mk
View File

@@ -23,7 +23,7 @@ PRODUCT_SUPPORTS_VERITY_FEC := true
# The dev key is used to sign boot and recovery images, and the verity
# metadata table. Actual product deliverables will be re-signed by hand.
# We expect this file to exist with the suffixes ".x509.pem" and ".pk8".
PRODUCT_VERITY_SIGNING_KEY := build/target/product/security/verity
PRODUCT_VERITY_SIGNING_KEY := build/make/target/product/security/verity
PRODUCT_PACKAGES += \
verity_key