summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>2020-09-04 15:29:42 +0200
committerDenis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>2020-09-04 16:25:42 +0200
commit8c6640532c70deed03918f80a00d6cf2559ecff0 (patch)
tree455f358516b4b1336e8eaae675665f5de47884c8
parenta2a71ee820873b1cd0360b7c926946971073881c (diff)
downloadmanifest-8c6640532c70deed03918f80a00d6cf2559ecff0.tar.gz
manifest-8c6640532c70deed03918f80a00d6cf2559ecff0.tar.bz2
manifest-8c6640532c70deed03918f80a00d6cf2559ecff0.zip
Override build/soon
This is done for two reasons: - Building mesa even with TEMPORARY_DISABLE_PATH_RESTRICTIONS=true results in a huge quantity of warnings like that: "xgettext" is not allowed to be used. See https://android.googlesource.com/platform/build/+/master/Changes.md#PATH_Tools for more information. - Not enabling TEMPORARY_DISABLE_PATH_RESTRICTIONS might even work if we manage to whitelist all the tools we need. It would also be a good thing as we need to use the host python2 and python3 to build mesa, and many other scripts in the Android source simply use 'python'. This will make sure (without having to dig into the details) that the host 'python' is not used accidentally. It could be an issue if the host 'python' points to python3, as Android 10 expects python to be python2. For instance: $ python3 ./bionic/libc/tools/genseccomp.py Traceback (most recent call last): File "./bionic/libc/tools/genseccomp.py", line 11, in <module> from gensyscalls import SysCallsTxtParser File "/home/replicant/replicant-10/bionic/libc/tools/gensyscalls.py", line 410 print "%d: %s" % (self.lineno, msg) ^ Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
-rw-r--r--default.xml4
-rw-r--r--replicant/repositories.xml5
2 files changed, 4 insertions, 5 deletions
diff --git a/default.xml b/default.xml
index 202e66d..f4926c8 100644
--- a/default.xml
+++ b/default.xml
@@ -26,10 +26,6 @@
<project path="build/blueprint" name="LineageOS/android_build_blueprint" groups="pdk,tradefed" />
<project path="build/kati" name="platform/build/kati" groups="pdk,tradefed" remote="aosp" />
- <project path="build/soong" name="LineageOS/android_build_soong" groups="pdk,tradefed" >
- <linkfile src="root.bp" dest="Android.bp" />
- <linkfile src="bootstrap.bash" dest="bootstrap.bash" />
- </project>
<project path="art" name="LineageOS/android_art" groups="pdk" />
<project path="bionic" name="LineageOS/android_bionic" groups="pdk" />
<project path="bootable/recovery" name="LineageOS/android_bootable_recovery" groups="pdk" />
diff --git a/replicant/repositories.xml b/replicant/repositories.xml
index 66a634d..c870b9b 100644
--- a/replicant/repositories.xml
+++ b/replicant/repositories.xml
@@ -9,7 +9,10 @@
<linkfile src="target" dest="build/target" />
<linkfile src="tools" dest="build/tools" />
</project>
-
+ <project path="build/soong" name="replicant-next/build_soong" groups="pdk,tradefed" remote="replicant-next" >
+ <linkfile src="root.bp" dest="Android.bp" />
+ <linkfile src="bootstrap.bash" dest="bootstrap.bash" />
+ </project>
<project path="device/samsung/i9300" name="replicant-next/device_samsung_i9300" remote="replicant-next" />
<project path="device/samsung/i9305" name="replicant-next/device_samsung_i9305" remote="replicant-next" />
<project path="device/samsung/midas-common" name="replicant-next/device_samsung_midas_common" remote="replicant-next" />