Chiebot-Mirror
/
protobuf
mirror of https://github.com/protocolbuffers/protobuf.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove the simulator target from all makefiles.

Browse Source 
Bug: 5010576

Change-Id: I9a5e66066482aa0007f221bb866ac57f4eb1b70c
pull/91/head
Jeff Brown 14 years ago
parent d4bdc4c78a
commit 17892bccbb
1 changed files with 0 additions and 6 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      Android.mk

6
Android.mk
Unescape View File

@ -186,11 +186,8 @@ LOCAL_C_INCLUDES := \
LOCAL_SHARED_LIBRARIES := \ LOCAL_SHARED_LIBRARIES := \
libcutils libutils libcutils libutils
# stlport conflicts with the host stl library
ifneq ($(TARGET_SIMULATOR),true)
LOCAL_C_INCLUDES += external/stlport/stlport LOCAL_C_INCLUDES += external/stlport/stlport
LOCAL_SHARED_LIBRARIES += libstlport LOCAL_SHARED_LIBRARIES += libstlport
endif
# Define the header files to be copied # Define the header files to be copied
#LOCAL_COPY_HEADERS := \ #LOCAL_COPY_HEADERS := \
@ -252,11 +249,8 @@ LOCAL_C_INCLUDES := \
LOCAL_SHARED_LIBRARIES := \ LOCAL_SHARED_LIBRARIES := \
libz libcutils libutils libz libcutils libutils
# stlport conflicts with the host stl library
ifneq ($(TARGET_SIMULATOR),true)
LOCAL_C_INCLUDES += external/stlport/stlport LOCAL_C_INCLUDES += external/stlport/stlport
LOCAL_SHARED_LIBRARIES += libstlport LOCAL_SHARED_LIBRARIES += libstlport
endif
# Define the header files to be copied # Define the header files to be copied
#LOCAL_COPY_HEADERS := \ #LOCAL_COPY_HEADERS := \

Write Preview
Loading…
Cancel
Save