From 3dc639ab064c13f031c821223a0b3aae0ad24a6f Mon Sep 17 00:00:00 2001
From: David Black <david8black@gmail.com>
Date: Sun, 19 Jan 2014 14:03:27 +0000
Subject: [PATCH] Use a different layout for RootTools srclib
---
metadata/stericson.busybox.donate.txt | 13 +++++++------
srclibs/RootTools.txt | 3 +--
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/metadata/stericson.busybox.donate.txt b/metadata/stericson.busybox.donate.txt
index 93fc09e45f..bd18b42f08 100644
--- a/metadata/stericson.busybox.donate.txt
+++ b/metadata/stericson.busybox.donate.txt
@@ -40,10 +40,10 @@ Build:10.3,161
commit=32
subdir=app/Pro
target=android-15
- srclibs=1:ViewPagerIndicator@8cd549;RootTools@310;BusyboxConfigs-linusyang@63dc
+ srclibs=1:ViewPagerIndicator@8cd549;RootTools@3.4;BusyboxConfigs-linusyang@63dc
rm=binaries;patches;app/Free;app/Pro/assets
prebuild=mkdir assets && \
- cp -r $$RootTools$$/3.4/src/com/ src/ && \
+ cp -r $$RootTools$$/src/com/ src/ && \
cp -r $$BusyboxConfigs-linusyang$$ ../BB && \
sed -i 's/darwin-x86_64/linux-x86/g;/android_ndk_config-w-patches/d;s/#CONFIG_FILE/CONFIG_FILE/' ../BB/Makefile
build=cd ../BB && \
@@ -58,9 +58,9 @@ Build:10.7,180
forceversion=yes
forcevercode=yes
gradle=pro
- srclibs=RootTools@310;BusyboxConfigs-linusyang@63dc
+ srclibs=RootTools@3.4;BusyboxConfigs-linusyang@63dc
prebuild=mkdir assets && \
- cp -r $$RootTools$$/3.4/src/com/stericson/RootTools src/main/java/stericson/ && \
+ cp -r $$RootTools$$/src/com/stericson/RootTools src/main/java/stericson/ && \
cp -r $$BusyboxConfigs-linusyang$$ ../BB && \
sed -i 's/darwin-x86_64/linux-x86/g;/android_ndk_config-w-patches/d;s/#CONFIG_FILE/CONFIG_FILE/' ../BB/Makefile
build=cd ../BB && \
@@ -75,9 +75,9 @@ Build:10.7,200
forcevercode=yes
subdir=application/Busybox
gradle=pro
- srclibs=RootTools@310;BusyboxConfigs@835af1
+ srclibs=RootTools@3.4;BusyboxConfigs@835af1
prebuild=mkdir assets && \
- cp -r $$RootTools$$/3.4/src/com/stericson/RootTools src/main/java/stericson/ && \
+ cp -r $$RootTools$$/src/com/stericson/RootTools src/main/java/stericson/ && \
cp -r $$BusyboxConfigs$$ ../BB && \
sed -i 's/i686-android-linux/i686-linux-android/g;/android_ndk_config-w-patches/d;s/#CONFIG_FILE/CONFIG_FILE/' ../BB/Makefile
build=cd ../BB && \
@@ -97,6 +97,7 @@ no commit descriptions.
It's now using gradle but it's half baked at time of writing.
Busybox x86 and MIPS hang for me with linusyang setup with stericson and basic configs.
+The Tias setup won't patch properly; maybe it's my version of sed.
The busybox binary was tested with toolchain 4.6; I don't have toolchain 4.4.3 installed.
So if it doesn't build just sed 4.6 in ../BB/Makefile.
diff --git a/srclibs/RootTools.txt b/srclibs/RootTools.txt
index 0e0d595a3b..98b563638e 100644
--- a/srclibs/RootTools.txt
+++ b/srclibs/RootTools.txt
@@ -1,7 +1,6 @@
Repo Type:git-svn
-Repo:http://roottools.googlecode.com/svn/trunk/Stable/TAGS
+Repo:http://roottools.googlecode.com/svn;trunk=trunk/Stable/RootTools-sdk3-generic;tags=trunk/Stable/TAGS
-# Better to copy the source code than to make jars
#Prepare:mkdir -p bin/classes && echo -e "android.library=true\ntarget=android-16\n" >> project.properties
#Update Project:Yes