ADHOC
/
replicant-vendor_replicant
3
0
Fork 0
Code Issues 6 Pull Requests Releases Activity

toolchain: add jack/jill build 

remove patch, commit is now included in prebuilt ndk

Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>
This commit is contained in:
Wolfgang Wiedmeyer 2016-01-29 01:21:43 +01:00
parent 242966e407
commit 46b133c041
No known key found for this signature in database
GPG Key ID: 5816A24C10757FC4
2 changed files with 30 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
build-toolchain
View File

@ -126,15 +126,37 @@ then
ln -s ../../../bionic/libc/include/stdatomic.h stdatomic.h
fi
#############################
# build jack/jill toolchain
# first the simple lib
cd ../../src/jack/simple
mvn-debian clean package -Dmaven.test.skip=true
cd ..
# then jack
ant clean dist
# setup the jack/jill binary folder
mkdir -p ../../jack_jill
cp jack/etc/Android.mk.build ../../jack_jill/Android.mk
cp dist/jack ../../jack_jill/
chmod +x ../../jack_jill/jack
cp dist/jack-admin ../../jack_jill/
chmod +x ../../jack_jill/jack-admin
cp dist/jack.jar ../../jack_jill/
cp dist/jack-launcher.jar ../../jack_jill/
# finally the jill.jar
cd ../jill
ant clean dist
cp dist/jill.jar ../../jack_jill/
cd $BASEDIR
#TODO:
# review other prebuilt tools from misc, tools, devtools and sdk
# search for bin directories in external and remove binaries
# build jack from source and rest of java toolchain (jack source has prebuilts, builds with ant dist)
# add relocation_packer correctly as dependency
# packages to install: gcc-arm-none-eabi, cmake, python-dev, swig, ant
# apt-get build-dep gcc-4.9 binutils llvm-defaults
# apply ndk patch
# search for binaries in external and remove them
# build manifest merger from source
# jack source has prebuilts

47
toolchain/0001-math-header-fix-for-clang-toolchain.patch
View File

@ -1,47 +0,0 @@
From 2df3726ab2be5b0addc87e292d2b0fbdd28e66e8 Mon Sep 17 00:00:00 2001
From: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>
Date: Thu, 14 Jan 2016 19:57:50 +0100
Subject: [PATCH] math header: fix for clang toolchain
Change-Id: Id617f610eb6aefdbc9903ded4149a296f5e87a03
Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>
---
9/platforms/android-14/arch-arm/usr/include/math.h | 5 -----
9/platforms/android-8/arch-arm/usr/include/math.h | 5 -----
2 files changed, 10 deletions(-)
diff --git a/9/platforms/android-14/arch-arm/usr/include/math.h b/9/platforms/android-14/arch-arm/usr/include/math.h
index 7fe24b9..4c773f3 100644
--- a/9/platforms/android-14/arch-arm/usr/include/math.h
+++ b/9/platforms/android-14/arch-arm/usr/include/math.h
@@ -528,11 +528,6 @@ double __builtin_fma(double, double, double) __NDK_FPABI_MATH__;
double __builtin_hypot(double, double) __NDK_FPABI_MATH__;
int __builtin_ilogb(double) __NDK_FPABI_MATH__ __pure2;
/* int __builtin_isinf(double) __NDK_FPABI_MATH__ __pure2; */
-#if !defined(__clang__) || __clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 7)
-int __builtin_isnan(double) __NDK_FPABI_MATH__ __pure2;
-#else
-/* clang < 3.7 has faulty prototype for __builtin_isnan */
-#endif
double __builtin_lgamma(double) __NDK_FPABI_MATH__;
long long __builtin_llrint(double) __NDK_FPABI_MATH__;
long long __builtin_llround(double) __NDK_FPABI_MATH__;
diff --git a/9/platforms/android-8/arch-arm/usr/include/math.h b/9/platforms/android-8/arch-arm/usr/include/math.h
index 0706a1f..5be7d1c 100644
--- a/9/platforms/android-8/arch-arm/usr/include/math.h
+++ b/9/platforms/android-8/arch-arm/usr/include/math.h
@@ -523,11 +523,6 @@ double __builtin_fma(double, double, double) __NDK_FPABI_MATH__;
double __builtin_hypot(double, double) __NDK_FPABI_MATH__;
int __builtin_ilogb(double) __NDK_FPABI_MATH__ __pure2;
/* int __builtin_isinf(double) __NDK_FPABI_MATH__ __pure2; */
-#if !defined(__clang__) || __clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 7)
-int __builtin_isnan(double) __NDK_FPABI_MATH__ __pure2;
-#else
-/* clang < 3.7 has faulty prototype for __builtin_isnan */
-#endif
double __builtin_lgamma(double) __NDK_FPABI_MATH__;
long long __builtin_llrint(double) __NDK_FPABI_MATH__;
long long __builtin_llround(double) __NDK_FPABI_MATH__;
--
2.1.4