Skip to content

Android Build: remove libcutils dependency, update .gitignore #115

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ggfan wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Android Build: remove libcutils dependency, update .gitignore #115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions android/WALT/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
.gradle
.idea
/local.properties
/.idea/workspace.xml
/.idea/libraries
**/build
**/obj
**/.gradle
**/.idea
**/*.iml
**/.externalNativeBuild
**/local.properties
.DS_Store
/build
/captures
/app/src/main/obj
/app/src/main/libs

3 changes: 0 additions & 3 deletions android/WALT/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@ android {
targetSdkVersion 23
versionCode 9
versionName "0.1.9"
externalNativeBuild.ndkBuild {
arguments "APP_PLATFORM=android-14", "APP_ALLOW_MISSING_DEPS=true"
}
}

externalNativeBuild.ndkBuild {
Expand Down
2 changes: 0 additions & 2 deletions android/WALT/app/src/main/jni/Android.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@ LOCAL_SRC_FILES := sync_clock_jni.c sync_clock.c player.c

LOCAL_CFLAGS := -g -DUSE_LIBLOG -Werror

# needed for logcat
LOCAL_SHARED_LIBRARIES := libcutils

LOCAL_LDLIBS := -lOpenSLES -llog

Expand Down