diff options
| author | Jeff Brown <jeffbrown@google.com> | 2011-07-11 22:12:04 -0700 |
|---|---|---|
| committer | Jeff Brown <jeffbrown@google.com> | 2011-07-11 22:12:04 -0700 |
| commit | e217977611c52bccde7f7c78e1d3c790c6357431 (patch) | |
| tree | 85924a9262c7bfdcbd1e63c400b78cbad0629f4a | |
| parent | 8a2f7578bb6289415f1d0a01c9cc96d283730480 (diff) | |
| download | external_protobuf-android-4.1.1_r1.1.zip external_protobuf-android-4.1.1_r1.1.tar.gz external_protobuf-android-4.1.1_r1.1.tar.bz2 | |
Remove the simulator target from all makefiles.android-sdk-adt_r20android-sdk-adt_r16.0.1android-sdk-4.0.3_r1android-sdk-4.0.3-tools_r1android-cts-verifier-4.0_r1android-cts-verifier-4.0.3_r1android-cts-4.1_r4android-cts-4.1_r2android-cts-4.1_r1android-cts-4.0_r1android-cts-4.0.3_r2android-cts-4.0.3_r1android-4.1.2_r2.1android-4.1.2_r2android-4.1.2_r1android-4.1.1_r6.1android-4.1.1_r6android-4.1.1_r5android-4.1.1_r4android-4.1.1_r3android-4.1.1_r2android-4.1.1_r1.1android-4.1.1_r1android-4.0.4_r2.1android-4.0.4_r2android-4.0.4_r1.2android-4.0.4_r1.1android-4.0.4_r1android-4.0.3_r1.1android-4.0.3_r1android-4.0.2_r1android-4.0.1_r1.2android-4.0.1_r1.1android-4.0.1_r1
Bug: 5010576
Change-Id: I9a5e66066482aa0007f221bb866ac57f4eb1b70c
| -rw-r--r-- | Android.mk | 6 |
1 files changed, 0 insertions, 6 deletions
@@ -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 := \ |