From 43b0ab7eb37ffa68e164ad4a31ebbbfe19bbbdf5 Mon Sep 17 00:00:00 2001
From: David Black <david8black@gmail.com>
Date: Wed, 25 Dec 2013 11:13:48 +0000
Subject: [PATCH] build all ABI's for the AOSP apps

---
 metadata/com.android.camera2.txt           |  7 ++++---
 metadata/com.android.inputmethod.latin.txt | 11 +++++++----
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/metadata/com.android.camera2.txt b/metadata/com.android.camera2.txt
index e1107caafc..f498ce53b2 100644
--- a/metadata/com.android.camera2.txt
+++ b/metadata/com.android.camera2.txt
@@ -8,8 +8,6 @@ Summary:Stock camera
 Description:
 This is the camera2 package which is a new package in Android 4.4,
 but it's compatible with Android 4.0.
-Not sure why it's a new package, probably it'll become Google Camera
-at some stage.
 .
 
 Repo Type:git
@@ -23,12 +21,15 @@ Build:4.4.2,1
     patch=build.xml_1.patch
     rm=tests
     prebuild=cp -r $$Xmp$$ . && \
-             echo -e 'source.dir=src_pd;src_pd_gcam;src;Xmp/XMPCore/src\nversion.name=4.4.2\nversion.code=1' >> ant.properties
+             echo -e 'source.dir=src_pd;src_pd_gcam;src;Xmp/XMPCore/src\nversion.name=4.4.2\nversion.code=1' >> ant.properties && \
+             echo 'APP_ABI := all' >> jni/Application.mk
     buildjni=yes
 
 Maintainer Notes:
 You could alway switch this to Cyanogenmod or OmniROM but at the moment they are very similar
 See version.mk for their version scheme
+
+build.xml patches are hairy; one can also use custom_rules.xml
 .
 
 Update Check Mode:None
diff --git a/metadata/com.android.inputmethod.latin.txt b/metadata/com.android.inputmethod.latin.txt
index b532999528..2531b8bea4 100644
--- a/metadata/com.android.inputmethod.latin.txt
+++ b/metadata/com.android.inputmethod.latin.txt
@@ -7,7 +7,11 @@ Summary:Stock keyboard
 Description:
 The current version comes with English, Spanish, Russian, Brazilian, Italian, 
 German, French, dictionaries; there are twenty more language word lists 
-in the repository but they need to be compiled.
+in the repository but they'd need to be compiled.
+
+Remember, you can use these very dictionary files for [[org.pocketworkstation.pckeyboard]],
+either built into the main apk or as addon packs.
+
 The version name corresponds to the Android version.
 .
 
@@ -21,10 +25,9 @@ Build:4.2.1,1
     extlibs=android/android-support-v4r13.jar
     srclibs=Inputmethodcommon@android-4.2.1_r1
     patch=build.xml_1.patch
-    prebuild=echo 'package.name=com.android.inputmethod.latin' >> ant.properties && \
-             sed -i '19 i android:versionName="4.2.1" android:versionCode="1"' AndroidManifest.xml && \
+    prebuild=sed -i '19 i android:versionName="4.2.1" android:versionCode="1"' AndroidManifest.xml && \
              cp -r $$Inputmethodcommon$$/java/com/android/inputmethodcommon src/com/android/
-    build=$$NDK$$/ndk-build -C ../native && mv ../native/libs/armeabi libs/
+    build=$$NDK$$/ndk-build -e "APP_ABI=all" -C ../native && mv ../native/libs/armeabi libs/
 
 Maintainer Notes:
 This version uses the prebuilt dictionaries in the repo;