summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoonas Kylmälä <joonas.kylmala@iki.fi>2020-06-29 07:32:57 -0400
committerJoonas Kylmälä <joonas.kylmala@iki.fi>2020-06-29 07:32:57 -0400
commitfa4308bcd1da6f85381ac6489a50770657ecd24e (patch)
tree39312ebff4325f09803b07b617432518dcde1efe
parentaaa777543e8a012900cff68b704401d5838243ee (diff)
downloadmanifest-fa4308bcd1da6f85381ac6489a50770657ecd24e.tar.gz
manifest-fa4308bcd1da6f85381ac6489a50770657ecd24e.tar.bz2
manifest-fa4308bcd1da6f85381ac6489a50770657ecd24e.zip
Revert "Use Replicant's fork of build_soong"
This reverts commit a5d9d1db0d7ff3ad47823f2ae4182f53451acd29. The fork added a patch to allow few individual system binaries to be used and disabled warnings for them but since the goal of Replicant is to replace all the prebuilt compilation tools there is no point of allowing all the compilation tools individually. Signed-off-by: Joonas Kylmälä <joonas.kylmala@iki.fi>
-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 63f49e1..b042c0a 100644
--- a/default.xml
+++ b/default.xml
@@ -27,6 +27,10 @@
<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 ac36f85..7e7a08f 100644
--- a/replicant/repositories.xml
+++ b/replicant/repositories.xml
@@ -10,11 +10,6 @@
<linkfile src="tools" dest="build/tools" />
</project>
- <project path="build/soong" name="replicant-9/build_soong" groups="pdk,tradefed" remote="replicant-9" revision="replicant-10">
- <linkfile src="root.bp" dest="Android.bp" />
- <linkfile src="bootstrap.bash" dest="bootstrap.bash" />
- </project>
-
<project path="device/samsung/midas-common" name="replicant-9/device_samsung_midas_common" remote="replicant-9" revision="replicant-10"/>
<project path="device/samsung/i9305" name="replicant-9/device_samsung_i9305" remote="replicant-9" revision="replicant-10"/>
<project path="device/samsung/i9300" name="replicant-9/device_samsung_i9300" remote="replicant-9" revision="replicant-10"/>