diff options
| author | Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> | 2022-01-02 19:59:27 +0100 |
|---|---|---|
| committer | Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> | 2022-01-03 18:28:31 +0100 |
| commit | b3b8c7485c4b6d1a3afe92265b5babebd09ae3cf (patch) | |
| tree | df9844ed0f4b43645945a2cc0e0cd505987d3c58 | |
| parent | 9919e82b97c0a9b61c1b2e74586a9e1bfe9a3356 (diff) | |
| download | system_core-b3b8c7485c4b6d1a3afe92265b5babebd09ae3cf.tar.gz system_core-b3b8c7485c4b6d1a3afe92265b5babebd09ae3cf.tar.bz2 system_core-b3b8c7485c4b6d1a3afe92265b5babebd09ae3cf.zip | |
Revert "Fix the build on Trisquel 9"HEADreplicant-6.0-0004-transitionreplicant-6.0-0004replicant-6.0
Without that fix, while building for the GT-N7100 device, we have the
following build error on Debian stretch:
target Generated: libart_32 <= art/runtime/verifier/method_verifier.h
Export includes file: system/core/libnativebridge/Android.mk --
[...]/out/host/linux-x86/obj/SHARED_LIBRARIES/libnativebridge_intermediates/export_includes
make: *** No rule to make target
'[...]/out/host/linux-x86/obj/SHARED_LIBRARIES/libbacktrace_intermediates/export_includes',
needed by
'[...]/out/host/linux-x86/obj/SHARED_LIBRARIES/libart_intermediates/import_includes'.
Stop. make: *** Waiting for unfinished jobs.... Export includes
file: art/sigchainlib/Android.mk --
[...]/out/host/linux-x86/obj/SHARED_LIBRARIES/libsigchain_intermediates/export_includes
21515 unique nodes, 102669 total
And on Trisquel 9, with all the patches to build Replicant 6.0 on
Trisquel 9, including the ones that are now reverted, Replicant 6.0
didn't build for some of the supported devices. And in the cases where
Replicant 6.0 built fine, it crashed during boot.
Since building on Trisquel 9 doesn't work yet anyway, we need to
revert the 9919e82b97c0a9b61c1b2e74586a9e1bfe9a3356 commit ("Fix the
build on Trisquel 9") to enable Debian stretch to build Replicant 6.0
again for the GT-N7100, especially because Debian Stretch is the only
distribution that is known to be able to build working Replicant 6.0
releases.
Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
| -rw-r--r-- | libbacktrace/Android.mk | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/libbacktrace/Android.mk b/libbacktrace/Android.mk index 97d50bcd7..6a689a61d 100644 --- a/libbacktrace/Android.mk +++ b/libbacktrace/Android.mk @@ -73,6 +73,9 @@ module_tag := optional build_type := target build_target := SHARED_LIBRARY include $(LOCAL_PATH)/Android.build.mk +build_type := host +libbacktrace_multilib := both +include $(LOCAL_PATH)/Android.build.mk #------------------------------------------------------------------------- # The libbacktrace_test library needed by backtrace_test. @@ -89,6 +92,8 @@ build_type := target build_target := SHARED_LIBRARY libbacktrace_test_multilib := both include $(LOCAL_PATH)/Android.build.mk +build_type := host +include $(LOCAL_PATH)/Android.build.mk #------------------------------------------------------------------------- # The backtrace_test executable. @@ -128,6 +133,8 @@ build_type := target build_target := NATIVE_TEST backtrace_test_multilib := both include $(LOCAL_PATH)/Android.build.mk +build_type := host +include $(LOCAL_PATH)/Android.build.mk #---------------------------------------------------------------------------- # Special truncated libbacktrace library for mac. |