Skip to content
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

Jump to bottom

Fix monodroid COMMON_CFLAGS usage and always build with RELEASE. #82

Merged
merged 3 commits into from
Jul 12, 2016
Merged

Fix monodroid COMMON_CFLAGS usage and always build with RELEASE. #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e2ebecb
Fix monodroid COMMON_CFLAGS usage and always build with RELEASE.
atsushieno Jun 15, 2016
a014321
Merge branch 'master' into fix-monodroid-cflags-2
atsushieno Jul 6, 2016
52a53cc
Remove RELEASE build flag from common. Instead default xabuild to Rel…
atsushieno Jul 6, 2016
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
2 changes: 1 addition & 1 deletion src/monodroid/jni/Android.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ else
COMMON_CFLAGS ?= -g -O2 -DRELEASE=1
endif

LOCAL_CFLAGS = $(COMMON_FLAGS) \
LOCAL_CFLAGS = $(COMMON_CFLAGS) \
-std=c99 \
-DHAVE_LINUX_NETLINK_H=1 -DHAVE_LINUX_RTNETLINK_H=1 \
-D_REENTRANT -DPLATFORM_ANDROID -DANDROID -DLINUX -Dlinux -D__linux_ \
Expand Down
2 changes: 1 addition & 1 deletion tools/scripts/xabuild
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ ANDROID_SDK_PATH=$(echo $ANDROID_SDK_PATH | sed 's/^\w*//g')
export ANDROID_NDK_PATH
export ANDROID_SDK_PATH

exec xbuild $MSBUILD_OPTIONS \
exec xbuild /p:Configuration=Release $MSBUILD_OPTIONS \
/p:AndroidNdkDirectory="$ANDROID_NDK_PATH" \
/p:AndroidSdkDirectory="$ANDROID_SDK_PATH" \
/p:MonoDroidInstallDirectory="$MONO_ANDROID_PATH" \
Expand Down