Skip to content

Commit c7fb1aa

Browse files
committed
build: t13.0: AICPfy
Change-Id: I6e76e474aeb608bbcb5da9cef2eb8f5d792988c3
1 parent 68fa0e7 commit c7fb1aa

16 files changed

+31
-31
lines changed

core/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6200,7 +6200,7 @@ $(call declare-0p-target,$(INTERNAL_OTA_METADATA))
62006200
ifeq ($(TARGET_BUILD_VARIANT),user)
62016201
$(INTERNAL_OTA_PACKAGE_TARGET): backuptool := false
62026202
else
6203-
ifneq ($(LINEAGE_BUILD),)
6203+
ifneq ($(AICP_BUILD),)
62046204
$(INTERNAL_OTA_PACKAGE_TARGET): backuptool := true
62056205
else
62066206
$(INTERNAL_OTA_PACKAGE_TARGET): backuptool := false

core/app_prebuilt_internal.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,8 +143,8 @@ else
143143
$(built_module): $(additional_certificates)
144144
$(built_module): PRIVATE_ADDITIONAL_CERTIFICATES := $(additional_certificates)
145145

146-
$(built_module): $(LOCAL_CERTIFICATE_LINEAGE)
147-
$(built_module): PRIVATE_CERTIFICATE_LINEAGE := $(LOCAL_CERTIFICATE_LINEAGE)
146+
$(built_module): $(LOCAL_CERTIFICATE_AICP)
147+
$(built_module): PRIVATE_CERTIFICATE_AICP := $(LOCAL_CERTIFICATE_AICP)
148148

149149
$(built_module): PRIVATE_ROTATION_MIN_SDK_VERSION := $(LOCAL_ROTATION_MIN_SDK_VERSION)
150150
endif

core/clear_vars.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ LOCAL_JAVA_RESOURCE_FILES:=
159159
LOCAL_JETIFIER_ENABLED:=
160160
LOCAL_JNI_SHARED_LIBRARIES:=
161161
LOCAL_JNI_SHARED_LIBRARIES_ABI:=
162-
LOCAL_CERTIFICATE_LINEAGE:=
162+
LOCAL_CERTIFICATE_AICP:=
163163
LOCAL_LDFLAGS:=
164164
LOCAL_LDLIBS:=
165165
LOCAL_LICENSE_CONDITIONS:=

core/config.mk

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -357,8 +357,8 @@ include $(BUILD_SYSTEM)/envsetup.mk
357357
FIND_LEAVES_EXCLUDES := $(addprefix --prune=, $(SCAN_EXCLUDE_DIRS) .repo .git)
358358

359359
-include vendor/extra/BoardConfigExtra.mk
360-
ifneq ($(LINEAGE_BUILD),)
361-
include vendor/lineage/config/BoardConfigLineage.mk
360+
ifneq ($(AICP_BUILD),)
361+
include vendor/aicp/config/BoardConfigAicp.mk
362362
endif
363363

364364
# The build system exposes several variables for where to find the kernel
@@ -1264,7 +1264,7 @@ dont_bother_goals := out product-graph
12641264
# consistency with those defined in BoardConfig.mk files.
12651265
include $(BUILD_SYSTEM)/android_soong_config_vars.mk
12661266

1267-
ifneq ($(LINEAGE_BUILD),)
1267+
ifneq ($(AICP_BUILD),)
12681268
ifneq ($(wildcard device/lineage/sepolicy/common/sepolicy.mk),)
12691269
## We need to be sure the global selinux policies are included
12701270
## last, to avoid accidental resetting by device configs

core/definitions.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2695,7 +2695,7 @@ endef
26952695
define sign-package-arg
26962696
$(hide) mv $(1) $(1).unsigned
26972697
$(hide) $(JAVA) -Djava.library.path=$$(dirname $(SIGNAPK_JNI_LIBRARY_PATH)) -jar $(SIGNAPK_JAR) \
2698-
$(if $(strip $(PRIVATE_CERTIFICATE_LINEAGE)), --lineage $(PRIVATE_CERTIFICATE_LINEAGE)) \
2698+
$(if $(strip $(PRIVATE_CERTIFICATE_AICP)), --aicp $(PRIVATE_CERTIFICATE_AICP)) \
26992699
$(if $(strip $(PRIVATE_ROTATION_MIN_SDK_VERSION)), --rotation-min-sdk-version $(PRIVATE_ROTATION_MIN_SDK_VERSION)) \
27002700
$(PRIVATE_CERTIFICATE) $(PRIVATE_PRIVATE_KEY) \
27012701
$(PRIVATE_ADDITIONAL_CERTIFICATES) $(1).unsigned $(1).signed

core/main.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -462,7 +462,7 @@ ADDITIONAL_SYSTEM_PROPERTIES += net.bt.name=Android
462462

463463
# ------------------------------------------------------------
464464
# Include vendor specific additions to build properties
465-
-include vendor/lineage/build/core/main.mk
465+
-include vendor/aicp/build/core/main.mk
466466

467467
# ------------------------------------------------------------
468468
# Define a function that, given a list of module tags, returns

core/package_internal.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -478,8 +478,8 @@ PACKAGES.$(LOCAL_PACKAGE_NAME).CERTIFICATE := $(certificate)
478478
$(LOCAL_BUILT_MODULE): $(additional_certificates)
479479
$(LOCAL_BUILT_MODULE): PRIVATE_ADDITIONAL_CERTIFICATES := $(additional_certificates)
480480

481-
$(LOCAL_BUILT_MODULE): $(LOCAL_CERTIFICATE_LINEAGE)
482-
$(LOCAL_BUILT_MODULE): PRIVATE_CERTIFICATE_LINEAGE := $(LOCAL_CERTIFICATE_LINEAGE)
481+
$(LOCAL_BUILT_MODULE): $(LOCAL_CERTIFICATE_AICP)
482+
$(LOCAL_BUILT_MODULE): PRIVATE_CERTIFICATE_AICP := $(LOCAL_CERTIFICATE_AICP)
483483

484484
$(LOCAL_BUILT_MODULE): PRIVATE_ROTATION_MIN_SDK_VERSION := $(LOCAL_ROTATION_MIN_SDK_VERSION)
485485

core/pathmap.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,4 +93,4 @@ FRAMEWORKS_BASE_SUBDIRS := \
9393
FRAMEWORKS_BASE_JAVA_SRC_DIRS := \
9494
$(addprefix frameworks/base/,$(FRAMEWORKS_BASE_SUBDIRS))
9595

96-
-include vendor/lineage/build/core/pathmap.mk
96+
-include vendor/aicp/build/core/pathmap.mk

core/sysprop.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ $(gen_from_buildinfo_sh): $(INTERNAL_BUILD_ID_MAKEFILE) $(API_FINGERPRINT) | $(B
255255
$(hide) TARGET_BUILD_TYPE="$(TARGET_BUILD_VARIANT)" \
256256
TARGET_BUILD_FLAVOR="$(TARGET_BUILD_FLAVOR)" \
257257
TARGET_DEVICE="$(TARGET_DEVICE)" \
258-
LINEAGE_DEVICE="$(TARGET_DEVICE)" \
258+
AICP_DEVICE="$(TARGET_DEVICE)" \
259259
PRODUCT_DEFAULT_LOCALE="$(call get-default-product-locale,$(PRODUCT_LOCALES))" \
260260
PRODUCT_DEFAULT_WIFI_CHANNELS="$(PRODUCT_DEFAULT_WIFI_CHANNELS)" \
261261
PRIVATE_BUILD_DESC="$(BUILD_DESC)" \

envsetup.sh

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ Invoke ". build/envsetup.sh" from your shell to add the following functions to y
4646
4747
EOF
4848

49-
__print_lineage_functions_help
49+
__print_aicp_functions_help
5050

5151
cat <<EOF
5252
@@ -59,7 +59,7 @@ EOF
5959
local T=$(gettop)
6060
local A=""
6161
local i
62-
for i in `cat $T/build/envsetup.sh $T/vendor/lineage/build/envsetup.sh | sed -n "/^[[:blank:]]*function /s/function \([a-z_]*\).*/\1/p" | sort | uniq`; do
62+
for i in `cat $T/build/envsetup.sh $T/vendor/aicp/build/envsetup.sh | sed -n "/^[[:blank:]]*function /s/function \([a-z_]*\).*/\1/p" | sort | uniq`; do
6363
A="$A $i"
6464
done
6565
echo $A
@@ -70,8 +70,8 @@ function build_build_var_cache()
7070
{
7171
local T=$(gettop)
7272
# Grep out the variable names from the script.
73-
cached_vars=(`cat $T/build/envsetup.sh $T/vendor/lineage/build/envsetup.sh | tr '()' ' ' | awk '{for(i=1;i<=NF;i++) if($i~/get_build_var/) print $(i+1)}' | sort -u | tr '\n' ' '`)
74-
cached_abs_vars=(`cat $T/build/envsetup.sh $T/vendor/lineage/build/envsetup.sh | tr '()' ' ' | awk '{for(i=1;i<=NF;i++) if($i~/get_abs_build_var/) print $(i+1)}' | sort -u | tr '\n' ' '`)
73+
cached_vars=(`cat $T/build/envsetup.sh $T/vendor/aicp/build/envsetup.sh | tr '()' ' ' | awk '{for(i=1;i<=NF;i++) if($i~/get_build_var/) print $(i+1)}' | sort -u | tr '\n' ' '`)
74+
cached_abs_vars=(`cat $T/build/envsetup.sh $T/vendor/aicp/build/envsetup.sh | tr '()' ' ' | awk '{for(i=1;i<=NF;i++) if($i~/get_abs_build_var/) print $(i+1)}' | sort -u | tr '\n' ' '`)
7575
# Call the build system to dump the "<val>=<value>" pairs as a shell script.
7676
build_dicts_script=`\builtin cd $T; build/soong/soong_ui.bash --dumpvars-mode \
7777
--vars="${cached_vars[*]}" \
@@ -153,12 +153,12 @@ function check_product()
153153
echo "Couldn't locate the top of the tree. Try setting TOP." >&2
154154
return
155155
fi
156-
if (echo -n $1 | grep -q -e "^lineage_") ; then
157-
LINEAGE_BUILD=$(echo -n $1 | sed -e 's/^lineage_//g')
156+
if (echo -n $1 | grep -q -e "^aicp_") ; then
157+
AICP_BUILD=$(echo -n $1 | sed -e 's/^aicp_//g')
158158
else
159-
LINEAGE_BUILD=
159+
AICP_BUILD=
160160
fi
161-
export LINEAGE_BUILD
161+
export AICP_BUILD
162162

163163
TARGET_PRODUCT=$1 \
164164
TARGET_BUILD_VARIANT= \
@@ -772,13 +772,13 @@ function lunch()
772772
# if we can't find a product, try to grab it off the LineageOS GitHub
773773
T=$(gettop)
774774
cd $T > /dev/null
775-
vendor/lineage/build/tools/roomservice.py $product
775+
vendor/aicp/build/tools/roomservice.py $product
776776
cd - > /dev/null
777777
check_product $product
778778
else
779779
T=$(gettop)
780780
cd $T > /dev/null
781-
vendor/lineage/build/tools/roomservice.py $product true
781+
vendor/aicp/build/tools/roomservice.py $product true
782782
cd - > /dev/null
783783
fi
784784

@@ -2004,4 +2004,4 @@ addcompletions
20042004

20052005
export ANDROID_BUILD_TOP=$(gettop)
20062006

2007-
. $ANDROID_BUILD_TOP/vendor/lineage/build/envsetup.sh
2007+
. $ANDROID_BUILD_TOP/vendor/aicp/build/envsetup.sh

0 commit comments

Comments
 (0)