diff options
| author | Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> | 2021-09-20 18:35:01 +0200 |
|---|---|---|
| committer | Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> | 2021-09-20 18:43:02 +0200 |
| commit | a90447df62c8881c17ccf3a0ab16ece532d722b1 (patch) | |
| tree | cbc67efdae64a7c9cb0013986325fd71e9500410 | |
| parent | c9a6b6b9d482d07219ee24d5537799eba4f07e34 (diff) | |
| download | manifest-a90447df62c8881c17ccf3a0ab16ece532d722b1.tar.gz manifest-a90447df62c8881c17ccf3a0ab16ece532d722b1.tar.bz2 manifest-a90447df62c8881c17ccf3a0ab16ece532d722b1.zip | |
Override build/make to fix building zip release files
Some python tools in build/make produce the following error
when building zip files (with make updatepackage or make
otapackage):
UnicodeDecodeError: 'ascii' codec can't decode byte 0xc3 in
position 30: ordinal not in range(128)
So we need to override build/make to fix that.
Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
| -rw-r--r-- | default.xml | 9 | ||||
| -rw-r--r-- | replicant/repositories.xml | 10 |
2 files changed, 10 insertions, 9 deletions
diff --git a/default.xml b/default.xml index 1e86a8b..e272d0a 100644 --- a/default.xml +++ b/default.xml @@ -17,15 +17,6 @@ remote="aosp" sync-j="4" /> - <project path="build/make" name="platform/build" groups="pdk" > - <copyfile src="core/root.mk" dest="Makefile" /> - <linkfile src="CleanSpec.mk" dest="build/CleanSpec.mk" /> - <linkfile src="buildspec.mk.default" dest="build/buildspec.mk.default" /> - <linkfile src="core" dest="build/core" /> - <linkfile src="envsetup.sh" dest="build/envsetup.sh" /> - <linkfile src="target" dest="build/target" /> - <linkfile src="tools" dest="build/tools" /> - </project> <project path="build/blueprint" name="platform/build/blueprint" groups="pdk,tradefed" /> <project path="art" name="platform/art" groups="pdk" /> <project path="bionic" name="platform/bionic" groups="pdk" /> diff --git a/replicant/repositories.xml b/replicant/repositories.xml index 8e5df31..3a7e9aa 100644 --- a/replicant/repositories.xml +++ b/replicant/repositories.xml @@ -1,5 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> <manifest> + <project path="build/make" name="replicant-next/build_make" groups="pdk" + remote="replicant" > + <copyfile src="core/root.mk" dest="Makefile" /> + <linkfile src="CleanSpec.mk" dest="build/CleanSpec.mk" /> + <linkfile src="buildspec.mk.default" dest="build/buildspec.mk.default" /> + <linkfile src="core" dest="build/core" /> + <linkfile src="envsetup.sh" dest="build/envsetup.sh" /> + <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" > <linkfile src="root.bp" dest="Android.bp" /> |