aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>2021-12-10 16:24:02 +0100
committerDenis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>2021-12-10 16:29:15 +0100
commitbec1429941b88347f341e8da08f27bfbf731301d (patch)
treef750af128fdbf0d3549ced45d446130ebe361017
parent41141d9d39d3aaeea6e97f21608f0323ce792494 (diff)
downloadbuild_make-replicant-11.tar.gz
build_make-replicant-11.tar.bz2
build_make-replicant-11.zip
Include vendor/replicant/build's core/main.mkHEADreplicant-11-nlnet-eu-grant-825310-replicant-updatereplicant-11
To use ADDITIONAL_BUILD_PROPERTIES in vendor/replicant/build, we need to include its core/main.mk here otherwise we have the following build error: build/make/core/main.mk:127: error: ADDITIONAL_BUILD_PROPERTIES must not be set before here: ro.replicant.build.version=11.0.alpha. ckati failed with: exit status 1 This commit is based on the followin commit from LineageOS's build/make repository[1]: 261741115e9a2e5a933810613dc7a3bfb5612f00 (build: Add Lineage build support) [1]The commit is available in the lineage-18.1 branch of https://github.com/LineageOS/android_build We removed the leading '-' used in the LineageOS commit as we want the build to fail if for some reason vendor/replicant/build/core/main.mk is not there. Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
-rw-r--r--core/main.mk4
1 files changed, 4 insertions, 0 deletions
diff --git a/core/main.mk b/core/main.mk
index 357c70da33..715aebee74 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -362,6 +362,10 @@ BUILD_WITHOUT_PV := true
ADDITIONAL_BUILD_PROPERTIES += net.bt.name=Android
# ------------------------------------------------------------
+# Include vendor specific additions to build properties
+include vendor/replicant/build/core/main.mk
+
+# ------------------------------------------------------------
# Define a function that, given a list of module tags, returns
# non-empty if that module should be installed in /system.