am 596edaf3: Merge change 26156 into eclair

Merge commit '596edaf343b5b3b39b0a32d9a61210cdf6f6cfa0' into eclair-plus-aosp

* commit '596edaf343b5b3b39b0a32d9a61210cdf6f6cfa0':
  keystore: exclude builds for simulator.
This commit is contained in:
Chia-chi Yeh
2009-09-21 10:01:06 -07:00
committed by Android Git Automerger

View File

@@ -14,6 +14,8 @@
# limitations under the License. # limitations under the License.
# #
ifneq ($(TARGET_SIMULATOR),true)
LOCAL_PATH:= $(call my-dir) LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS) include $(CLEAR_VARS)
@@ -30,3 +32,5 @@ LOCAL_SHARED_LIBRARIES := libcutils libcrypto
LOCAL_MODULE:= keystore_cli LOCAL_MODULE:= keystore_cli
LOCAL_MODULE_TAGS := debug LOCAL_MODULE_TAGS := debug
include $(BUILD_EXECUTABLE) include $(BUILD_EXECUTABLE)
endif