Fix Android project compilation - revtestexternal has not to be compiled in a release

livecodesebastien · livecodesebastien · commit 3e6c31326a23 · 2014-07-21T15:49:43.000+01:00
diff --git a/revtestexternal/Android.mk b/revtestexternal/Android.mk
@@ -1,5 +1,8 @@
 LOCAL_PATH := $(call my-dir)
 
+# only build if run from the revtestexternal/build-android.sh script
+ifeq ($(NAME),revtestexternal)
+
 include $(CLEAR_VARS)
 
 TARGET_PLATFORM=android-8
@@ -31,3 +34,5 @@ LOCAL_LDFLAGS += \
  	-Wl,-u,MCExternalFinalize
 
 include $(BUILD_SHARED_LIBRARY)
+
+endif
diff --git a/revtestexternal/build-android.sh b/revtestexternal/build-android.sh
@@ -1,4 +1,4 @@
-NAME=revtestexternal
+export NAME=revtestexternal
 WORKSPACE=`cd ..; pwd`
 PROJECT=$WORKSPACE/$NAME
 
@@ -22,6 +22,9 @@ DSTROOT=$SRCROOT/_build/android/$MODE/$NAME
 JAVAC=$JAVA_SDK/bin/javac
 JAR=$JAVA_SDK/bin/jar
 
+echo "Building LCIDL for mac..."
+sdks/Xcode_5_1/usr/bin/xcodebuild -project lcidlc/lcidlc.xcodeproj -configuration $MAC_MODE
+
 echo "Building external stubs…"
 mkdir -p "$PROJECT/derived_src"
 echo "$PROJECT/../_build/mac/$MAC_MODE/lcidlc"
