shithub: openh264

Info  •  Files  •  Log  •  Branches

Merge pull request #315 from mstorsjo/android-cleanup

Minor cleanup of the android build files

--- /dev/null

+++ b/codec/build/android/.gitignore

@@ -1,0 +1,5 @@

+build.xml

+local.properties

+proguard-project.txt

+gen

+bin

--- a/codec/build/android/dec/jni/Application.mk

+++ b/codec/build/android/dec/jni/Application.mk

@@ -17,5 +17,4 @@

 endif

 APP_STL := stlport_shared

-#APP_STL := gnustl_shared

 APP_PLATFORM := android-12

--- a/codec/build/android/dec/jni/welsdecdemo.mk

+++ b/codec/build/android/dec/jni/welsdecdemo.mk

@@ -1,12 +1,6 @@

 # Generate the libwelsdecdemo.so file

 LOCAL_PATH := $(call my-dir)

-#include $(CLEAR_VARS)

-#LOCAL_MODULE := stlport

-#LOCAL_SRC_FILES := $(NDK_ROOT)/sources/cxx-stl/stlport/libs/$(TARGET_ARCH_ABI)/libstlport_static.a

-#LOCAL_EXPORT_C_INCLUDES := $(NDK_ROOT)/sources/cxx-stl/stlport/stlport

-#include $(PREBUILT_STATIC_LIBRARY)

-

 include $(CLEAR_VARS)

 LOCAL_MODULE    := wels

 LOCAL_SRC_FILES := $(LOCAL_PATH)/../../../../../libwels.so

@@ -48,9 +42,7 @@

 LOCAL_ARM_MODE := arm

 endif

-#LOCAL_STATIC_LIBRARIES += stlport

 LOCAL_LDLIBS := -llog

-#LOCAL_LDLIBS += -L../../../ -lwels

 LOCAL_SHARED_LIBRARIES := wels

 include $(BUILD_SHARED_LIBRARY)

--- a/codec/build/android/dec/proguard.cfg

+++ /dev/null

@@ -1,40 +1,0 @@

--optimizationpasses 5

--dontusemixedcaseclassnames

--dontskipnonpubliclibraryclasses

--dontpreverify

--verbose

--optimizations !code/simplification/arithmetic,!field/*,!class/merging/*

-

--keep public class * extends android.app.Activity

--keep public class * extends android.app.Application

--keep public class * extends android.app.Service

--keep public class * extends android.content.BroadcastReceiver

--keep public class * extends android.content.ContentProvider

--keep public class * extends android.app.backup.BackupAgentHelper

--keep public class * extends android.preference.Preference

--keep public class com.android.vending.licensing.ILicensingService

-

--keepclasseswithmembernames class * {

-    native <methods>;

-}

-

--keepclasseswithmembers class * {

-    public <init>(android.content.Context, android.util.AttributeSet);

-}

-

--keepclasseswithmembers class * {

-    public <init>(android.content.Context, android.util.AttributeSet, int);

-}

-

--keepclassmembers class * extends android.app.Activity {

-   public void *(android.view.View);

-}

-

--keepclassmembers enum * {

-    public static **[] values();

-    public static ** valueOf(java.lang.String);

-}

-

--keep class * implements android.os.Parcelable {

-  public static final android.os.Parcelable$Creator *;

-}

--- a/codec/build/android/enc/jni/Application.mk

+++ b/codec/build/android/enc/jni/Application.mk

@@ -17,5 +17,4 @@

 endif

 APP_STL := stlport_shared

-#APP_STL := gnustl_shared

 APP_PLATFORM := android-12

--- a/codec/build/android/enc/jni/welsencdemo.mk

+++ b/codec/build/android/enc/jni/welsencdemo.mk

@@ -1,12 +1,6 @@

 # Generate the libwelsdecdemo.so file

 LOCAL_PATH := $(call my-dir)

-#include $(CLEAR_VARS)

-#LOCAL_MODULE := stlport

-#LOCAL_SRC_FILES := $(NDK_ROOT)/sources/cxx-stl/stlport/libs/$(TARGET_ARCH_ABI)/libstlport_static.a

-#LOCAL_EXPORT_C_INCLUDES := $(NDK_ROOT)/sources/cxx-stl/stlport/stlport

-#include $(PREBUILT_STATIC_LIBRARY)

-

 include $(CLEAR_VARS)

 LOCAL_MODULE    := wels

 LOCAL_SRC_FILES := $(LOCAL_PATH)/../../../../../libwels.so

@@ -39,6 +33,7 @@

             $(LOCAL_PATH)/../../../../api/svc \

             $(LOCAL_PATH)/../../../../console/enc/inc \

             $(LOCAL_PATH)/../../../../encoder/core/inc \

+            $(LOCAL_PATH)/../../../../processing/interface \

             $(LOCAL_PATH)/../../../../common

@@ -51,9 +46,7 @@

 LOCAL_ARM_MODE := arm

 endif

-#LOCAL_STATIC_LIBRARIES += stlport

 LOCAL_LDLIBS := -llog

-#LOCAL_LDLIBS += -L../../../ -lwels

 LOCAL_SHARED_LIBRARIES := wels

 include $(BUILD_SHARED_LIBRARY)

--- a/codec/build/android/enc/proguard.cfg

+++ /dev/null

@@ -1,40 +1,0 @@

--optimizationpasses 5

--dontusemixedcaseclassnames

--dontskipnonpubliclibraryclasses

--dontpreverify

--verbose

--optimizations !code/simplification/arithmetic,!field/*,!class/merging/*

-

--keep public class * extends android.app.Activity

--keep public class * extends android.app.Application

--keep public class * extends android.app.Service

--keep public class * extends android.content.BroadcastReceiver

--keep public class * extends android.content.ContentProvider

--keep public class * extends android.app.backup.BackupAgentHelper

--keep public class * extends android.preference.Preference

--keep public class com.android.vending.licensing.ILicensingService

-

--keepclasseswithmembernames class * {

-    native <methods>;

-}

-

--keepclasseswithmembers class * {

-    public <init>(android.content.Context, android.util.AttributeSet);

-}

-

--keepclasseswithmembers class * {

-    public <init>(android.content.Context, android.util.AttributeSet, int);

-}

-

--keepclassmembers class * extends android.app.Activity {

-   public void *(android.view.View);

-}

-

--keepclassmembers enum * {

-    public static **[] values();

-    public static ** valueOf(java.lang.String);

-}

-

--keep class * implements android.os.Parcelable {

-  public static final android.os.Parcelable$Creator *;

-}