From a22e4567146cae9184c4ad661267826f8fc7ec3f Mon Sep 17 00:00:00 2001 From: notaz Date: Sat, 9 Jun 2012 00:54:35 +0300 Subject: [PATCH] build hacks, r3 release --- README | 3 ++- apps/AndroidSupportV2/Android.mk | 17 ++++++++++++++++ .../support/v2/app/FragmentActivity.java | 2 +- .../android/support/v2/view/MenuCompat.java | 4 ++-- apps/oi-filemanager/FileManager/Android.mk | 20 +++++++++++++++++++ .../oi-filemanager/FileManager/jni/Android.mk | 5 ++++- .../FileManager/res/layout/dialog_details.xml | 12 +++++------ .../FileManager/res/values/strings.xml | 3 +++ pandora.mk | 15 ++++++++------ patches/external_custom.patch | 15 ++++++++++++++ pnd/gingerbread.pxml | 4 ++-- 11 files changed, 81 insertions(+), 19 deletions(-) create mode 100644 apps/AndroidSupportV2/Android.mk create mode 100644 apps/oi-filemanager/FileManager/Android.mk create mode 100644 patches/external_custom.patch diff --git a/README b/README index a4ee577..abb7420 100644 --- a/README +++ b/README @@ -16,8 +16,9 @@ Building from source This will get all sources from rowboat project, except pandora support that will come from it's own git. -3. Apply the pandora patch: +3. Apply the pandora patches: patch -p1 < device/openpandora/pandora/patches/all.patch + patch -p1 < device/openpandora/pandora/patches/external_custom.patch 4. Build Android and create .pnd file: make diff --git a/apps/AndroidSupportV2/Android.mk b/apps/AndroidSupportV2/Android.mk new file mode 100644 index 0000000..349e282 --- /dev/null +++ b/apps/AndroidSupportV2/Android.mk @@ -0,0 +1,17 @@ +LOCAL_PATH:= $(call my-dir) +include $(CLEAR_VARS) + +LOCAL_MODULE_TAGS := optional + +LOCAL_SRC_FILES := $(call all-java-files-under, src) + +LOCAL_MODULE := AndroidSupportV2 +LOCAL_SDK_VERSION := current + + +include $(BUILD_STATIC_JAVA_LIBRARY) + +# Use the following include to make our test apk. +include $(call all-makefiles-under,$(LOCAL_PATH)) + + diff --git a/apps/AndroidSupportV2/src/android/support/v2/app/FragmentActivity.java b/apps/AndroidSupportV2/src/android/support/v2/app/FragmentActivity.java index 682af75..330edaa 100644 --- a/apps/AndroidSupportV2/src/android/support/v2/app/FragmentActivity.java +++ b/apps/AndroidSupportV2/src/android/support/v2/app/FragmentActivity.java @@ -529,7 +529,7 @@ public class FragmentActivity extends Activity { if (android.support.v2.os.Build.VERSION.SDK_INT >= HONEYCOMB) { // If we are running on HC or greater, we can use the framework // API to invalidate the options menu. - ActivityCompatHoneycomb.invalidateOptionsMenu(this); + //ActivityCompatHoneycomb.invalidateOptionsMenu(this); return; } diff --git a/apps/AndroidSupportV2/src/android/support/v2/view/MenuCompat.java b/apps/AndroidSupportV2/src/android/support/v2/view/MenuCompat.java index 565f4cf..5228fb6 100644 --- a/apps/AndroidSupportV2/src/android/support/v2/view/MenuCompat.java +++ b/apps/AndroidSupportV2/src/android/support/v2/view/MenuCompat.java @@ -45,7 +45,7 @@ public class MenuCompat { static class HoneycombMenuVersionImpl implements MenuVersionImpl { @Override public boolean setShowAsAction(MenuItem item, int actionEnum) { - MenuCompatHoneycomb.setShowAsAction(item, actionEnum); + //MenuCompatHoneycomb.setShowAsAction(item, actionEnum); return true; } } @@ -57,7 +57,7 @@ public class MenuCompat { static { //v4 if (android.os.Build.VERSION.SDK_INT >= 11) { if (android.support.v2.os.Build.VERSION.SDK_INT >= 11) { - IMPL = new HoneycombMenuVersionImpl(); + IMPL = null;//new HoneycombMenuVersionImpl(); } else { IMPL = new BaseMenuVersionImpl(); } diff --git a/apps/oi-filemanager/FileManager/Android.mk b/apps/oi-filemanager/FileManager/Android.mk new file mode 100644 index 0000000..0cf4189 --- /dev/null +++ b/apps/oi-filemanager/FileManager/Android.mk @@ -0,0 +1,20 @@ +LOCAL_PATH:= $(call my-dir) +include $(CLEAR_VARS) + +LOCAL_MODULE_TAGS := optional + +LOCAL_SRC_FILES := $(call all-java-files-under, src) + +LOCAL_STATIC_JAVA_LIBRARIES := AndroidSupportV2 + +LOCAL_PACKAGE_NAME := oi-filemanager +LOCAL_SDK_VERSION := current +#LOCAL_CERTIFICATE := shared + + +include $(BUILD_PACKAGE) + +# Use the following include to make our test apk. +include $(call all-makefiles-under,$(LOCAL_PATH)) + + diff --git a/apps/oi-filemanager/FileManager/jni/Android.mk b/apps/oi-filemanager/FileManager/jni/Android.mk index b3acfbe..c4419e1 100644 --- a/apps/oi-filemanager/FileManager/jni/Android.mk +++ b/apps/oi-filemanager/FileManager/jni/Android.mk @@ -5,4 +5,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := access LOCAL_SRC_FILES := access.c -include $(BUILD_SHARED_LIBRARY) \ No newline at end of file +LOCAL_MODULE_TAGS := optional +LOCAL_PRELINK_MODULE := false + +include $(BUILD_SHARED_LIBRARY) diff --git a/apps/oi-filemanager/FileManager/res/layout/dialog_details.xml b/apps/oi-filemanager/FileManager/res/layout/dialog_details.xml index ecb4520..c069a2f 100644 --- a/apps/oi-filemanager/FileManager/res/layout/dialog_details.xml +++ b/apps/oi-filemanager/FileManager/res/layout/dialog_details.xml @@ -32,7 +32,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_weight="1" - android:text="TextView" /> + android:text="@string/text_view" /> @@ -57,7 +57,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_weight="1" - android:text="TextView" /> + android:text="@string/text_view" /> @@ -81,7 +81,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_weight="1" - android:text="TextView" /> + android:text="@string/text_view" /> @@ -105,7 +105,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_weight="1" - android:text="TextView" /> + android:text="@string/text_view" /> @@ -129,8 +129,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_weight="1" - android:text="TextView" /> + android:text="@string/text_view" /> - \ No newline at end of file + diff --git a/apps/oi-filemanager/FileManager/res/values/strings.xml b/apps/oi-filemanager/FileManager/res/values/strings.xml index c06dab1..88232b7 100644 --- a/apps/oi-filemanager/FileManager/res/values/strings.xml +++ b/apps/oi-filemanager/FileManager/res/values/strings.xml @@ -192,4 +192,7 @@ File %s exists. Do you want to overwrite it? Do you want to change the file extension? + + + TextView diff --git a/pandora.mk b/pandora.mk index fae44a1..500f1cd 100644 --- a/pandora.mk +++ b/pandora.mk @@ -1,10 +1,13 @@ PRODUCT_PACKAGES := \ - ApiDemos \ - SoundRecorder \ - GeneralRunner \ - BluetoothSCOApp \ - alsa.$(TARGET_PRODUCT) \ - kill_android \ + ApiDemos \ + SoundRecorder \ + GeneralRunner \ + BluetoothSCOApp \ + alsa.$(TARGET_PRODUCT) \ + kill_android \ + AndroidTerm \ + libjackpal-androidterm3 \ + oi-filemanager \ $(call inherit-product, build/target/product/generic.mk) diff --git a/patches/external_custom.patch b/patches/external_custom.patch new file mode 100644 index 0000000..87df369 --- /dev/null +++ b/patches/external_custom.patch @@ -0,0 +1,15 @@ + +project external_custom/android-terminal-emulator/ +diff --git a/external_custom/android-terminal-emulator/jni/Android.mk b/external_custom/android-terminal-emulator/jni/Android.mk +index da25a8f..bfbd384 100644 +--- a/external_custom/android-terminal-emulator/jni/Android.mk ++++ b/external_custom/android-terminal-emulator/jni/Android.mk +@@ -29,4 +29,8 @@ LOCAL_SRC_FILES:= \ + + LOCAL_LDLIBS := -ldl -llog + ++LOCAL_SHARED_LIBRARIES := liblog ++LOCAL_PRELINK_MODULE := false ++LOCAL_MODULE_TAGS := optional ++ + include $(BUILD_SHARED_LIBRARY) diff --git a/pnd/gingerbread.pxml b/pnd/gingerbread.pxml index 77e70f3..a2f8353 100644 --- a/pnd/gingerbread.pxml +++ b/pnd/gingerbread.pxml @@ -4,7 +4,7 @@ Android Gingerbread - + @@ -23,7 +23,7 @@ - + -- 2.39.5