generic-library/openh264
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #315 from mstorsjo/android-cleanup

Browse Source 
Minor cleanup of the android build files
This commit is contained in:
Ethan Hugg 2014-02-19 15:58:12 -08:00
commit 89cd3cb5b6
7 changed files with 6 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
codec/build/android/.gitignore vendored Normal file
View File

@ -0,0 +1,5 @@
build.xml
local.properties
proguard-project.txt
gen
bin

1
codec/build/android/dec/jni/Application.mk
View File

@ -17,5 +17,4 @@ endif
endif
APP_STL := stlport_shared
#APP_STL := gnustl_shared
APP_PLATFORM := android-12

8
codec/build/android/dec/jni/welsdecdemo.mk
View File

@ -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 @@ ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
LOCAL_ARM_MODE := arm
endif
#LOCAL_STATIC_LIBRARIES += stlport
LOCAL_LDLIBS := -llog
#LOCAL_LDLIBS += -L../../../ -lwels
LOCAL_SHARED_LIBRARIES := wels
include $(BUILD_SHARED_LIBRARY)

40
codec/build/android/dec/proguard.cfg
View File

@ -1,40 +0,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 *;
}

1
codec/build/android/enc/jni/Application.mk
View File

@ -17,5 +17,4 @@ endif
endif
APP_STL := stlport_shared
#APP_STL := gnustl_shared
APP_PLATFORM := android-12

9
codec/build/android/enc/jni/welsencdemo.mk
View File

@ -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_C_INCLUDES := \
$(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 @@ ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
LOCAL_ARM_MODE := arm
endif
#LOCAL_STATIC_LIBRARIES += stlport
LOCAL_LDLIBS := -llog
#LOCAL_LDLIBS += -L../../../ -lwels
LOCAL_SHARED_LIBRARIES := wels
include $(BUILD_SHARED_LIBRARY)

40
codec/build/android/enc/proguard.cfg
View File

@ -1,40 +0,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 *;
}