Skip to content

P
protobuf
Commit 17892bcc authored by Jeff Brown's avatar Jeff Brown
Browse files
Options

Remove the simulator target from all makefiles. 

Bug: 5010576

Change-Id: I9a5e66066482aa0007f221bb866ac57f4eb1b70c
parent d4bdc4c7
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 6 deletions
Android.mk
View file @ 17892bcc
......@@ -186,11 +186,8 @@ LOCAL_C_INCLUDES := \
LOCAL_SHARED_LIBRARIES := \
libcutils libutils
# stlport conflicts with the host stl library
ifneq ($(TARGET_SIMULATOR),true)
LOCAL_C_INCLUDES += external/stlport/stlport
LOCAL_SHARED_LIBRARIES += libstlport
endif
# Define the header files to be copied
#LOCAL_COPY_HEADERS := \
......@@ -252,11 +249,8 @@ LOCAL_C_INCLUDES := \
LOCAL_SHARED_LIBRARIES := \
libz libcutils libutils
# stlport conflicts with the host stl library
ifneq ($(TARGET_SIMULATOR),true)
LOCAL_C_INCLUDES += external/stlport/stlport
LOCAL_SHARED_LIBRARIES += libstlport
endif
# Define the header files to be copied
#LOCAL_COPY_HEADERS := \
......
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