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

Commit b801fa66 authored by Dan Willemsen's avatar Dan Willemsen Committed by android-build-merger
Browse files

Merge "Stop using build/target -> build/make/target symlink" am: e3ef0412 

am: db1e6e9c

Change-Id: I3900e2c73b2379a9b4d36576f3e9d02bd4dd24b7
parents 8dddeb05 db1e6e9c

core/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -325,7 +325,7 @@ endif 
# non-default dev keys (usually private keys from a vendor directory).

# Both of these tags will be removed and replaced with "release-keys"

# when the target-files is signed in a post-build step.

ifeq ($(DEFAULT_SYSTEM_DEV_CERTIFICATE),build/target/product/security/testkey)

ifeq ($(DEFAULT_SYSTEM_DEV_CERTIFICATE),build/make/target/product/security/testkey)

BUILD_KEYS := test-keys

else

BUILD_KEYS := dev-keys
@@ -3585,7 +3585,7 @@ $(BUILT_OTATOOLS_PACKAGE): zip_root := $(call intermediates-dir-for,PACKAGING,ot 


OTATOOLS_DEPS := \

  system/extras/ext4_utils/mke2fs.conf \

  $(sort $(shell find build/target/product/security -type f -name "*.x509.pem" -o -name "*.pk8" -o \

  $(sort $(shell find build/make/target/product/security -type f -name "*.x509.pem" -o -name "*.pk8" -o \

      -name verity_key))



ifneq (,$(wildcard device))

core/config.mk

+2 −2
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ ORIGINAL_MAKECMDGOALS := $(MAKECMDGOALS) 


UNAME := $(shell uname -sm)



SRC_TARGET_DIR := $(TOPDIR)build/target

SRC_TARGET_DIR := $(TOPDIR)build/make/target



# Some specific paths to tools

SRC_DROIDDOC_DIR := $(TOPDIR)build/make/tools/droiddoc
@@ -762,7 +762,7 @@ endif 
ifdef PRODUCT_DEFAULT_DEV_CERTIFICATE

  DEFAULT_SYSTEM_DEV_CERTIFICATE := $(PRODUCT_DEFAULT_DEV_CERTIFICATE)

else

  DEFAULT_SYSTEM_DEV_CERTIFICATE := build/target/product/security/testkey

  DEFAULT_SYSTEM_DEV_CERTIFICATE := build/make/target/product/security/testkey

endif

.KATI_READONLY := DEFAULT_SYSTEM_DEV_CERTIFICATE

target/board/generic_arm64/BoardConfig.mk

+1 −1
Original line number Diff line number Diff line
@@ -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

target/board/generic_arm64_ab/BoardConfig.mk

+1 −1
Original line number Diff line number Diff line
@@ -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

target/board/generic_arm_ab/BoardConfig.mk

+1 −1
Original line number Diff line number Diff line
@@ -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