aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--core/Makefile15
-rw-r--r--core/android_soong_config_vars.mk2
-rw-r--r--core/app_prebuilt_internal.mk4
-rw-r--r--core/clear_vars.mk2
-rw-r--r--core/config.mk11
-rw-r--r--core/definitions.mk2
-rw-r--r--core/package_internal.mk6
-rw-r--r--core/pathmap.mk2
-rw-r--r--envsetup.sh14
-rw-r--r--target/product/aosp_product.mk4
-rw-r--r--target/product/base_system.mk2
-rw-r--r--target/product/full_base.mk2
-rw-r--r--target/product/full_base_telephony.mk2
-rw-r--r--target/product/gsi/Android.bp2
-rw-r--r--target/product/gsi_release.mk4
-rw-r--r--target/product/handheld_product.mk2
-rw-r--r--tools/signapk/src/com/android/signapk/SignApk.java14
17 files changed, 52 insertions, 38 deletions
diff --git a/core/Makefile b/core/Makefile
index 35c885d08d..067416a75c 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -3509,6 +3509,16 @@ ifneq (,$(filter address, $(SANITIZE_TARGET)))
endif
endif
+.PHONY: systemimage-changelog
+systemimage-changelog:
+ifneq (1,$(USER_BUILD_NO_CHANGELOG))
+ @echo "Making changelog!"
+ ./vendor/aicp/tools/changelog $(PRODUCT_OUT)
+else
+ @echo "Skipping changelog!"
+endif
+CHANGELOG := systemimage-changelog
+
FULL_SYSTEMIMAGE_DEPS += $(INTERNAL_ROOT_FILES) $(INSTALLED_FILES_FILE_ROOT)
# -----------------------------------------------------------------
@@ -6594,7 +6604,8 @@ $(BUILT_TARGET_FILES_DIR): \
$(MAKE_RECOVERY_PATCH) \
$(BUILT_KERNEL_CONFIGS_FILE) \
$(BUILT_KERNEL_VERSION_FILE) \
- | $(ACP)
+ | $(ACP) \
+ $(CHANGELOG)
@echo "Building target files: $@"
$(hide) rm -rf $@ $@.list $(zip_root)
$(hide) mkdir -p $(dir $@) $(zip_root)
@@ -7172,7 +7183,7 @@ $(call declare-0p-target,$(INTERNAL_OTA_METADATA))
ifeq ($(TARGET_BUILD_VARIANT),user)
$(INTERNAL_OTA_PACKAGE_TARGET): backuptool := false
else
-ifneq ($(LINEAGE_BUILD),)
+ifneq ($(AICP_BUILD),)
$(INTERNAL_OTA_PACKAGE_TARGET): backuptool := true
else
$(INTERNAL_OTA_PACKAGE_TARGET): backuptool := false
diff --git a/core/android_soong_config_vars.mk b/core/android_soong_config_vars.mk
index 1fedb3abbb..f7422cdbc8 100644
--- a/core/android_soong_config_vars.mk
+++ b/core/android_soong_config_vars.mk
@@ -49,7 +49,7 @@ $(call add_soong_config_var,ANDROID,TARGET_ADD_ROOT_EXTRA_VENDOR_SYMLINKS)
# For BUILDING_GSI
$(call soong_config_set_bool,gsi,building_gsi,$(if $(filter true,$(BUILDING_GSI)),true,false))
-$(call soong_config_set_bool,gsi,building_lineage_gsi,$(if $(filter true,$(BUILDING_LINEAGE_GSI)),true,false))
+$(call soong_config_set_bool,gsi,building_aicp_gsi,$(if $(filter true,$(BUILDING_AICP_GSI)),true,false))
# For bootable/recovery
RECOVERY_API_VERSION := 3
diff --git a/core/app_prebuilt_internal.mk b/core/app_prebuilt_internal.mk
index 2671956c7a..e01ca624f7 100644
--- a/core/app_prebuilt_internal.mk
+++ b/core/app_prebuilt_internal.mk
@@ -138,8 +138,8 @@ else
$(built_module): $(additional_certificates)
$(built_module): PRIVATE_ADDITIONAL_CERTIFICATES := $(additional_certificates)
- $(built_module): $(LOCAL_CERTIFICATE_LINEAGE)
- $(built_module): PRIVATE_CERTIFICATE_LINEAGE := $(LOCAL_CERTIFICATE_LINEAGE)
+ $(built_module): $(LOCAL_CERTIFICATE_AICP)
+ $(built_module): PRIVATE_CERTIFICATE_AICP := $(LOCAL_CERTIFICATE_AICP)
$(built_module): PRIVATE_ROTATION_MIN_SDK_VERSION := $(LOCAL_ROTATION_MIN_SDK_VERSION)
endif
diff --git a/core/clear_vars.mk b/core/clear_vars.mk
index 8a98c13b1d..9cab9b0978 100644
--- a/core/clear_vars.mk
+++ b/core/clear_vars.mk
@@ -136,7 +136,7 @@ LOCAL_JAVA_RESOURCE_DIRS:=
LOCAL_JAVA_RESOURCE_FILES:=
LOCAL_JNI_SHARED_LIBRARIES:=
LOCAL_JNI_SHARED_LIBRARIES_ABI:=
-LOCAL_CERTIFICATE_LINEAGE:=
+LOCAL_CERTIFICATE_AICP:=
LOCAL_LDFLAGS:=
LOCAL_LDLIBS:=
LOCAL_LICENSE_CONDITIONS:=
diff --git a/core/config.mk b/core/config.mk
index 191d69d9a7..2f633ab79f 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -471,8 +471,8 @@ endif
# See envsetup.mk for a description of SCAN_EXCLUDE_DIRS
FIND_LEAVES_EXCLUDES := $(addprefix --prune=, $(SCAN_EXCLUDE_DIRS) .repo .git)
-ifneq ($(LINEAGE_BUILD),)
-include vendor/lineage/config/BoardConfigLineage.mk
+ifneq ($(AICP_BUILD),)
+include vendor/aicp/config/BoardConfigAicp.mk
endif
# The build system exposes several variables for where to find the kernel
@@ -1291,12 +1291,15 @@ include $(BUILD_SYSTEM)/sysprop_config.mk
# consistency with those defined in BoardConfig.mk files.
include $(BUILD_SYSTEM)/android_soong_config_vars.mk
-ifneq ($(LINEAGE_BUILD),)
+ifneq ($(AICP_BUILD),)
ifneq ($(wildcard device/lineage/sepolicy/common/sepolicy.mk),)
## We need to be sure the global selinux policies are included
## last, to avoid accidental resetting by device configs
$(eval include device/lineage/sepolicy/common/sepolicy.mk)
endif
+ifneq ($(wildcard device/aicp/sepolicy/common/sepolicy.mk),)
+$(eval include device/aicp/sepolicy/common/sepolicy.mk)
+endif
endif
# EMMA_INSTRUMENT is set to true when coverage is enabled. Creates a suffix to
@@ -1353,7 +1356,7 @@ endif
# when the target-files is signed in a post-build step.
ifeq ($(DEFAULT_SYSTEM_DEV_CERTIFICATE),build/make/target/product/security/testkey)
BUILD_KEYS := test-keys
-else ifneq ($(filter vendor/lineage-priv/%,$(DEFAULT_SYSTEM_DEV_CERTIFICATE)),)
+else ifneq ($(filter vendor/aicp-priv/%,$(DEFAULT_SYSTEM_DEV_CERTIFICATE)),)
BUILD_KEYS := release-keys
else
BUILD_KEYS := dev-keys
diff --git a/core/definitions.mk b/core/definitions.mk
index ea151fac37..48ebda3907 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -2956,7 +2956,7 @@ endef
define sign-package-arg
$(hide) mv $(1) $(1).unsigned
$(hide) $(JAVA) -Djava.library.path=$$(dirname $(SIGNAPK_JNI_LIBRARY_PATH)) -jar $(SIGNAPK_JAR) \
- $(if $(strip $(PRIVATE_CERTIFICATE_LINEAGE)), --lineage $(PRIVATE_CERTIFICATE_LINEAGE)) \
+ $(if $(strip $(PRIVATE_CERTIFICATE_AICP)), --aicp $(PRIVATE_CERTIFICATE_AICP)) \
$(if $(strip $(PRIVATE_ROTATION_MIN_SDK_VERSION)), --rotation-min-sdk-version $(PRIVATE_ROTATION_MIN_SDK_VERSION)) \
$(PRIVATE_CERTIFICATE) $(PRIVATE_PRIVATE_KEY) \
$(PRIVATE_ADDITIONAL_CERTIFICATES) $(1).unsigned $(1).signed
diff --git a/core/package_internal.mk b/core/package_internal.mk
index a7eb57218f..a18dc8ad8d 100644
--- a/core/package_internal.mk
+++ b/core/package_internal.mk
@@ -480,8 +480,8 @@ PACKAGES.$(LOCAL_PACKAGE_NAME).CERTIFICATE := $(certificate)
$(LOCAL_BUILT_MODULE): $(additional_certificates)
$(LOCAL_BUILT_MODULE): PRIVATE_ADDITIONAL_CERTIFICATES := $(additional_certificates)
-$(LOCAL_BUILT_MODULE): $(LOCAL_CERTIFICATE_LINEAGE)
-$(LOCAL_BUILT_MODULE): PRIVATE_CERTIFICATE_LINEAGE := $(LOCAL_CERTIFICATE_LINEAGE)
+$(LOCAL_BUILT_MODULE): $(LOCAL_CERTIFICATE_AICP)
+$(LOCAL_BUILT_MODULE): PRIVATE_CERTIFICATE_AICP := $(LOCAL_CERTIFICATE_AICP)
$(LOCAL_BUILT_MODULE): PRIVATE_ROTATION_MIN_SDK_VERSION := $(LOCAL_ROTATION_MIN_SDK_VERSION)
@@ -732,4 +732,4 @@ ifneq (,$(runtime_resource_overlays_product)$(runtime_resource_overlays_vendor))
endif
endif
-$(if $(my_register_name),$(eval ALL_MODULES.$(my_register_name).MAKE_MODULE_TYPE:=PACKAGE)) \ No newline at end of file
+$(if $(my_register_name),$(eval ALL_MODULES.$(my_register_name).MAKE_MODULE_TYPE:=PACKAGE))
diff --git a/core/pathmap.mk b/core/pathmap.mk
index 0876b1c97c..e01eac9e2b 100644
--- a/core/pathmap.mk
+++ b/core/pathmap.mk
@@ -93,4 +93,4 @@ FRAMEWORKS_BASE_SUBDIRS := \
FRAMEWORKS_BASE_JAVA_SRC_DIRS := \
$(addprefix frameworks/base/,$(FRAMEWORKS_BASE_SUBDIRS))
--include vendor/lineage/build/core/pathmap.mk
+-include vendor/aicp/build/core/pathmap.mk
diff --git a/envsetup.sh b/envsetup.sh
index 18909b16a9..685032c16d 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -53,8 +53,8 @@ function build_build_var_cache()
{
local T=$(gettop)
# Grep out the variable names from the script.
- 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_cached/) print $(i+1)}' | sort -u | tr '\n' ' '`)
- 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_cached/) print $(i+1)}' | sort -u | tr '\n' ' '`)
+ 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_cached/) print $(i+1)}' | sort -u | tr '\n' ' '`)
+ 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_cached/) print $(i+1)}' | sort -u | tr '\n' ' '`)
# Call the build system to dump the "<val>=<value>" pairs as a shell script.
build_dicts_script=`\builtin cd $T; build/soong/soong_ui.bash --dumpvars-mode \
--vars="${cached_vars[*]}" \
@@ -487,7 +487,7 @@ function _lunch_meat()
set_stuff_for_environment
[[ -n "${ANDROID_QUIET_BUILD:-}" ]] || printconfig
- if [[ -z "${ANDROID_QUIET_BUILD}" && -z "${LINEAGE_BUILD}" ]]; then
+ if [[ -z "${ANDROID_QUIET_BUILD}" && -z "${AICP_BUILD}" ]]; then
local spam_for_lunch=$(gettop)/build/make/tools/envsetup/spam_for_lunch
if [[ -x $spam_for_lunch ]]; then
$spam_for_lunch
@@ -590,16 +590,16 @@ function lunch()
if ! check_product $product $release
then
- # if we can't find a product, try to grab it off the LineageOS GitHub
+ # if we can't find a product, try to grab it off the AICP GitHub
T=$(gettop)
cd $T > /dev/null
- vendor/lineage/build/tools/roomservice.py $product
+ vendor/aicp/build/tools/roomservice.py $product
cd - > /dev/null
check_product $product $release
else
T=$(gettop)
cd $T > /dev/null
- vendor/lineage/build/tools/roomservice.py $product true
+ vendor/aicp/build/tools/roomservice.py $product true
cd - > /dev/null
fi
@@ -1150,4 +1150,4 @@ addcompletions
export ANDROID_BUILD_TOP=$(gettop)
-. $ANDROID_BUILD_TOP/vendor/lineage/build/envsetup.sh
+. $ANDROID_BUILD_TOP/vendor/aicp/build/envsetup.sh
diff --git a/target/product/aosp_product.mk b/target/product/aosp_product.mk
index 67ab7a7433..071877b29e 100644
--- a/target/product/aosp_product.mk
+++ b/target/product/aosp_product.mk
@@ -19,7 +19,7 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/handheld_product.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/product/telephony_product.mk)
# Default AOSP sounds
-ifeq ($(LINEAGE_BUILD),)
+ifeq ($(AICP_BUILD),)
$(call inherit-product-if-exists, frameworks/base/data/sounds/AllAudio.mk)
endif
@@ -39,7 +39,7 @@ PRODUCT_PACKAGES += \
# Telephony:
# Provide a APN configuration to GSI product
-ifeq ($(LINEAGE_BUILD),)
+ifeq ($(AICP_BUILD),)
PRODUCT_COPY_FILES += \
device/sample/etc/apns-full-conf.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/apns-conf.xml
endif
diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index 3f29c102e7..a241520b09 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -539,7 +539,7 @@ PRODUCT_PACKAGES_DEBUG := \
unwind_reg_info \
unwind_symbols \
-ifeq ($(LINEAGE_BUILD),)
+ifeq ($(AICP_BUILD),)
PRODUCT_PACKAGES_DEBUG += \
su
endif
diff --git a/target/product/full_base.mk b/target/product/full_base.mk
index 7aa7903dd4..9631dd9c4e 100644
--- a/target/product/full_base.mk
+++ b/target/product/full_base.mk
@@ -45,7 +45,7 @@ PRODUCT_VENDOR_PROPERTIES := \
PRODUCT_LOCALES := en_US
# Get some sounds
-ifeq ($(LINEAGE_BUILD),)
+ifeq ($(AICP_BUILD),)
$(call inherit-product-if-exists, frameworks/base/data/sounds/AllAudio.mk)
endif
diff --git a/target/product/full_base_telephony.mk b/target/product/full_base_telephony.mk
index e4f5a162bb..609b952a40 100644
--- a/target/product/full_base_telephony.mk
+++ b/target/product/full_base_telephony.mk
@@ -26,7 +26,7 @@ PRODUCT_VENDOR_PROPERTIES := \
PRODUCT_COPY_FILES := \
frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml
-ifeq ($(LINEAGE_BUILD),)
+ifeq ($(AICP_BUILD),)
PRODUCT_COPY_FILES += \
device/sample/etc/apns-full-conf.xml:system/etc/apns-conf.xml
endif
diff --git a/target/product/gsi/Android.bp b/target/product/gsi/Android.bp
index a9c8dc6e72..87f54beb37 100644
--- a/target/product/gsi/Android.bp
+++ b/target/product/gsi/Android.bp
@@ -206,7 +206,7 @@ android_system_image {
default: [],
}),
enabled: select((soong_config_variable("gsi", "building_gsi"),
- soong_config_variable("gsi", "building_lineage_gsi")), {
+ soong_config_variable("gsi", "building_aicp_gsi")), {
(true, true): false,
(true, default): true,
(default, default): false,
diff --git a/target/product/gsi_release.mk b/target/product/gsi_release.mk
index d2e60964aa..9a409fa84d 100644
--- a/target/product/gsi_release.mk
+++ b/target/product/gsi_release.mk
@@ -27,8 +27,8 @@
#
BUILDING_GSI := true
-ifneq ($(filter lineage_gsi_%,$(TARGET_PRODUCT)),)
-BUILDING_LINEAGE_GSI := true
+ifneq ($(filter aicp_gsi_%,$(TARGET_PRODUCT)),)
+BUILDING_AICP_GSI := true
endif
PRODUCT_ARTIFACT_PATH_REQUIREMENT_ALLOWED_LIST += \
diff --git a/target/product/handheld_product.mk b/target/product/handheld_product.mk
index ae7cbe0a16..5cfdf7121a 100644
--- a/target/product/handheld_product.mk
+++ b/target/product/handheld_product.mk
@@ -34,7 +34,7 @@ PRODUCT_PACKAGES += \
SettingsIntelligence \
frameworks-base-overlays
-ifeq ($(LINEAGE_BUILD),)
+ifeq ($(AICP_BUILD),)
PRODUCT_PACKAGES += \
LatinIME
endif
diff --git a/tools/signapk/src/com/android/signapk/SignApk.java b/tools/signapk/src/com/android/signapk/SignApk.java
index 654e19675d..218e9305bb 100644
--- a/tools/signapk/src/com/android/signapk/SignApk.java
+++ b/tools/signapk/src/com/android/signapk/SignApk.java
@@ -1092,7 +1092,7 @@ class SignApk {
Integer minSdkVersionOverride = null;
boolean signUsingApkSignatureSchemeV2 = true;
boolean signUsingApkSignatureSchemeV4 = false;
- SigningCertificateLineage certLineage = null;
+ SigningCertificateLineage certAicp = null;
Integer rotationMinSdkVersion = null;
int argstart = 0;
@@ -1145,13 +1145,13 @@ class SignApk {
} else if ("--enable-v4".equals(args[argstart])) {
signUsingApkSignatureSchemeV4 = true;
++argstart;
- } else if ("--lineage".equals(args[argstart])) {
- File lineageFile = new File(args[++argstart]);
+ } else if ("--aicp".equals(args[argstart])) {
+ File aicpFile = new File(args[++argstart]);
try {
- certLineage = SigningCertificateLineage.readFromFile(lineageFile);
+ certAicp = SigningCertificateLineage.readFromFile(aicpFile);
} catch (Exception e) {
throw new IllegalArgumentException(
- "Error reading lineage file: " + e.getMessage());
+ "Error reading aicp file: " + e.getMessage());
}
++argstart;
} else if ("--rotation-min-sdk-version".equals(args[argstart])) {
@@ -1261,8 +1261,8 @@ class SignApk {
.setOtherSignersSignaturesPreserved(false)
.setCreatedBy("1.0 (Android SignApk)");
- if (certLineage != null) {
- builder = builder.setSigningCertificateLineage(certLineage);
+ if (certAicp != null) {
+ builder = builder.setSigningCertificateLineage(certAicp);
}
if (rotationMinSdkVersion != null) {
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-20 03:18:33 +0000