Remove the simulator target from all makefiles.

[android-x86/hardware-ril.git] / mock-ril / Android.mk

diff --git a/mock-ril/Android.mk b/mock-ril/Android.mk
index e8cc58c..540bf89 100644 (file)
--- a/mock-ril/Android.mk
+++ b/mock-ril/Android.mk
@@ -4,27 +4,18 @@
 
 LOCAL_PATH:= $(call my-dir)
 
-ifeq ($(TARGET_ARCH),arm)
+# Directories of source files
+src_cpp := src/cpp
+src_java := src/java
+src_py := src/py
+src_js := src/js
+src_proto := src/proto
 
+ifeq ($(TARGET_ARCH),arm)
 # Mock-ril only buid for debug variants
 ifneq ($(filter userdebug eng tests, $(TARGET_BUILD_VARIANT)),)
 
 include $(CLEAR_VARS)
-
-# Directories of source files
-src_cpp=src/cpp
-src_java=src/java
-src_py=src/py
-src_js=src/js
-src_proto=src/proto
-src_generated=src/generated
-
-# Directories of generated source files
-gen_src_cpp=$(src_generated)/cpp
-gen_src_java=$(src_generated)/java
-gen_src_py=$(src_generated)/python
-gen_src_desc=$(src_generated)/desc
-
 LOCAL_SRC_FILES:= \
     $(src_cpp)/ctrl_server.cpp \
     $(src_cpp)/experiments.cpp \
@@ -38,46 +29,37 @@ LOCAL_SRC_FILES:= \
     $(src_cpp)/util.cpp \
     $(src_cpp)/worker.cpp \
     $(src_cpp)/worker_v8.cpp \
-    $(gen_src_cpp)/ril.pb.cpp \
-    $(gen_src_cpp)/ctrl.pb.cpp \
-    $(gen_src_cpp)/msgheader.pb.cpp
-
+    $(call all-proto-files-under, $(src_proto))
 
 LOCAL_SHARED_LIBRARIES := \
     libz libcutils libutils libril
 
 LOCAL_STATIC_LIBRARIES := \
-    libprotobuf-cpp-2.3.0-full libv8
+    libv8
 
-LOCAL_CFLAGS := -D_GNU_SOURCE -UNDEBUG -DGOOGLE_PROTOBUF_NO_RTTI -DRIL_SHLIB
+LOCAL_CFLAGS := -D_GNU_SOURCE -UNDEBUG -DRIL_SHLIB
 
 LOCAL_C_INCLUDES := \
-    $(src_cpp) \
-    $(gen_src_cpp) \
-    external/protobuf/src \
+    $(LOCAL_PATH)/$(src_cpp) \
     external/v8/include \
     bionic \
     $(KERNEL_HEADERS)
 
-# stlport conflicts with the host stl library
-ifneq ($(TARGET_SIMULATOR),true)
 LOCAL_SHARED_LIBRARIES += libstlport
 LOCAL_C_INCLUDES += external/stlport/stlport
-endif
 
-# build shared library but don't require it be prelinked
 # __BSD_VISIBLE for htolexx macros.
 LOCAL_STRIP_MODULE := true
-LOCAL_PRELINK_MODULE := false
+
 LOCAL_LDLIBS += -lpthread
 LOCAL_CFLAGS += -DMOCK_RIL -D__BSD_VISIBLE
+LOCAL_PROTOC_OPTIMIZE_TYPE := full
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE:= libmock_ril
 
 include $(BUILD_SHARED_LIBRARY)
 
 endif
-
 endif
 
 # Java librilproto
@@ -86,9 +68,16 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := librilproto-java
 
-LOCAL_STATIC_JAVA_LIBRARIES := libprotobuf-java-2.3.0-micro
+LOCAL_PROTOC_OPTIMIZE_TYPE := micro
 
-LOCAL_SRC_FILES := $(call all-java-files-under, $(src_java) $(gen_src_java))
+LOCAL_SRC_FILES := $(call all-java-files-under, $(src_java)) \
+       $(call all-proto-files-under, $(src_proto))
 
 include $(BUILD_STATIC_JAVA_LIBRARY)
 # =======================================================
+
+src_cpp :=
+src_java :=
+src_py :=
+src_js :=
+src_proto :=