Commit 3954d719 authored by TwistedUmbrella's avatar TwistedUmbrella
Browse files

Streamline the build process to prevent possibility for errors

parent ba909474
......@@ -31,15 +31,9 @@ Tools required:
From project root directory:
```
cd shell\android\xperia
export ANDROID_NDK=\ <-Type the full path to your NDK here
rm -rf libs
android update project -p . --target "android-9"
ndk-build -j4
cd ..\
cd shell\android
android update project -p . --target "android-19"
......
......@@ -8,16 +8,6 @@
<exec executable="${ndk.dir}/ndk-build" failonerror="true" osfamily="unix">
<arg line="-j8 ${ndkbuildopt}"/>
</exec>
<copy todir="${jar.libs.dir}/armeabi-v7a">
<fileset
dir="xperia/libs/armeabi-v7a"
includes="libsexplay.so" />
</copy>
<copy todir="${jar.libs.dir}/x86">
<fileset
dir="xperia/libs/x86"
includes="libsexplay.so" />
</copy>
</target>
<target name="clean" depends="android_rules.clean">
<exec executable="${ndk.dir}/ndk-build.cmd" failonerror="true" osfamily="windows">
......
......@@ -28,7 +28,9 @@ endif
include $(LOCAL_PATH)/../../core/core.mk
LOCAL_SRC_FILES := $(RZDCY_FILES) $(wildcard $(LOCAL_PATH)/jni/src/*.cpp)
LOCAL_SRC_FILES := $(RZDCY_FILES)
LOCAL_SRC_FILES += $(wildcard $(LOCAL_PATH)/jni/src/Android.cpp)
LOCAL_SRC_FILES += $(wildcard $(LOCAL_PATH)/jni/src/utils.cpp)
LOCAL_CXXFLAGS := $(RZDCY_CXXFLAGS)
LOCAL_SHARED_LIBRARIES:= libcutils libutils
......@@ -63,3 +65,18 @@ LOCAL_ARM_MODE := arm
include $(BUILD_SHARED_LIBRARY)
$(call import-module,android/native_app_glue)
LOCAL_CERTIFICATE := shared
LOCAL_PATH:= $(call my-dir)/..
include $(CLEAR_VARS)
LOCAL_MODULE := sexplay
LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/jni/src/XperiaPlay.c)
LOCAL_LDLIBS := -llog -landroid -lEGL -lGLESv1_CM
LOCAL_STATIC_LIBRARIES := android_native_app_glue
include $(BUILD_SHARED_LIBRARY)
$(call import-module,android/native_app_glue)
LOCAL_CERTIFICATE := shared
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_MODULE := sexplay
LOCAL_SRC_FILES := XperiaPlay.c
LOCAL_LDLIBS := -llog -landroid -lEGL -lGLESv1_CM
LOCAL_STATIC_LIBRARIES := android_native_app_glue
include $(BUILD_SHARED_LIBRARY)
$(call import-module,android/native_app_glue)
\ No newline at end of file
APP_ABI := armeabi-v7a x86
#APP_ABI := armeabi-v7a
APP_PLATFORM := android-9
NDK_TOOLCHAIN_VERSION := 4.8
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment