diff options
| author | Luca Stefani <luca020400@lineageos.org> | 2017-08-17 21:21:23 +0200 |
|---|---|---|
| committer | alk3pInjection <webmaster@raspii.tech> | 2022-01-12 09:10:05 +0800 |
| commit | f70ed6938b521b9a821d0f87fbcbe0f412f581ba (patch) | |
| tree | d0bd6e1f49c1e9c5ae7807b5997ed5849ab15825 | |
| parent | 653a2915102a22ff3c4a7dc7690062aa042949c8 (diff) | |
Add Project ICE build support
Squashed also with the following changes:
Author: Simon Shields <simon@lineageos.org>
Date: Fri Mar 2 12:55:47 2018 +1100
build: Unconditionally use AOSPA pathmap.
even if we're not building a lineage target, we need to
use the lineage pathmap to make things like recovery and ril
happy
Change-Id: I974c30ad10d4ff5b7805c3df9c22010f1e002bf1
Author: Luca Stefani <luca.stefani.ge1@gmail.com>
Date: Tue Jan 22 15:50:52 2019 +0100
Don't export BUILD_NUMBER in envsetup.
* The value is meant to be set only before running an /official/ build
* This allows us to execute consecutive make commands without
running kati for every invocation
Change-Id: Ifa94b839f30c7260009c8a3c91c202b50e28022e
Change-Id: I6ca3c6a68aa5ea78649b96ac86fb65ff7f489736
| -rw-r--r-- | core/clear_vars.mk | 3 | ||||
| -rw-r--r-- | core/config.mk | 4 | ||||
| -rw-r--r-- | core/sysprop.mk | 1 | ||||
| -rw-r--r-- | envsetup.sh | 9 | ||||
| -rwxr-xr-x | tools/buildinfo.sh | 2 |
5 files changed, 19 insertions, 0 deletions
diff --git a/core/clear_vars.mk b/core/clear_vars.mk index 9487e78121..294a2e8aaf 100644 --- a/core/clear_vars.mk +++ b/core/clear_vars.mk @@ -502,6 +502,9 @@ LOCAL_TEST_PACKAGE := full_android_manifest := non_system_module := +# Include any vendor specific clear_vars.mk file +-include vendor/*/build/core/clear_vars.mk + # Trim MAKEFILE_LIST so that $(call my-dir) doesn't need to # iterate over thousands of entries every time. # Leave the current makefile to make sure we don't break anything diff --git a/core/config.mk b/core/config.mk index ff9e0a25cf..e57e4b6f24 100644 --- a/core/config.mk +++ b/core/config.mk @@ -319,6 +319,10 @@ include $(BUILD_SYSTEM)/envsetup.mk # See envsetup.mk for a description of SCAN_EXCLUDE_DIRS FIND_LEAVES_EXCLUDES := $(addprefix --prune=, $(SCAN_EXCLUDE_DIRS) .repo .git) +ifneq ($(ICE_BUILD),) +include vendor/ice/target/board/BoardConfigICE.mk +endif + # The build system exposes several variables for where to find the kernel # headers: # TARGET_DEVICE_KERNEL_HEADERS is automatically created for the current diff --git a/core/sysprop.mk b/core/sysprop.mk index 249212d1b9..d016ff373a 100644 --- a/core/sysprop.mk +++ b/core/sysprop.mk @@ -234,6 +234,7 @@ $(gen_from_buildinfo_sh): $(INTERNAL_BUILD_ID_MAKEFILE) $(API_FINGERPRINT) | $(B $(hide) TARGET_BUILD_TYPE="$(TARGET_BUILD_VARIANT)" \ TARGET_BUILD_FLAVOR="$(TARGET_BUILD_FLAVOR)" \ TARGET_DEVICE="$(TARGET_DEVICE)" \ + ICE_DEVICE="$(TARGET_DEVICE)" \ PRODUCT_DEFAULT_LOCALE="$(call get-default-product-locale,$(PRODUCT_LOCALES))" \ PRODUCT_DEFAULT_WIFI_CHANNELS="$(PRODUCT_DEFAULT_WIFI_CHANNELS)" \ BUILD_ID="$(BUILD_ID)" \ diff --git a/envsetup.sh b/envsetup.sh index 1e3e598605..579d6a7631 100644 --- a/envsetup.sh +++ b/envsetup.sh @@ -153,6 +153,13 @@ function check_product() echo "Couldn't locate the top of the tree. Try setting TOP." >&2 return fi + if (echo -n $1 | grep -q -e "^ice_") ; then + ICE_BUILD=$(echo -n $1 | sed -e 's/^ice_//g') + else + ICE_BUILD= + fi + export ICE_BUILD + TARGET_PRODUCT=$1 \ TARGET_BUILD_VARIANT= \ TARGET_BUILD_TYPE= \ @@ -702,6 +709,8 @@ function lunch() return 1 fi + check_product $product + TARGET_PRODUCT=$product \ TARGET_BUILD_VARIANT=$variant \ TARGET_PLATFORM_VERSION=$version \ diff --git a/tools/buildinfo.sh b/tools/buildinfo.sh index a79bf846d7..1f9d411c81 100755 --- a/tools/buildinfo.sh +++ b/tools/buildinfo.sh @@ -54,4 +54,6 @@ if [ -n "$BUILD_THUMBPRINT" ] ; then echo "ro.build.thumbprint=$BUILD_THUMBPRINT" fi +echo "ro.ice.device=$ICE_DEVICE" + echo "# end build properties" |