diff options
| author | Paul Duffin <paulduffin@google.com> | 2017-01-20 13:50:23 +0000 |
|---|---|---|
| committer | Paul Duffin <paulduffin@google.com> | 2017-01-20 13:50:23 +0000 |
| commit | 74299c53a59140905e0259cb0a1130cb719733d8 (patch) | |
| tree | aa4a6a53609f47d386dfa114be0abfc01e0e5dff /Android.mk | |
| parent | f1015b50e715aefc3070d83d95340cbc29811329 (diff) | |
| download | hamcrest-74299c53a59140905e0259cb0a1130cb719733d8.tar.gz | |
Match upstream file structure
Bug: 30946317
Test: make checkbuild and run cts CtsTextTestCases
Change-Id: I6c1773018f95855eb6599d66f6fb5923c7d48b03
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 35 |
1 files changed, 3 insertions, 32 deletions
@@ -1,4 +1,5 @@ -# Copyright (C) 2012 The Android Open Source Project +# +# Copyright (C) 2016 The Android Open Source Project # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -12,35 +13,5 @@ # See the License for the specific language governing permissions and # limitations under the License. # -# - -LOCAL_PATH := $(call my-dir) - -# build for the host JVM -#----------------------- -include $(CLEAR_VARS) -LOCAL_SRC_FILES := $(call all-java-files-under, src) -LOCAL_MODULE := hamcrest-host -LOCAL_MODULE_TAGS := optional -include $(BUILD_HOST_JAVA_LIBRARY) - -# build for the host dalvik -# ------------------------- -include $(CLEAR_VARS) -LOCAL_SRC_FILES := $(call all-java-files-under, src) -LOCAL_MODULE := hamcrest-hostdex -LOCAL_MODULE_TAGS := optional -include $(BUILD_HOST_DALVIK_STATIC_JAVA_LIBRARY) - -#------------------------------- -# build a target jar - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := $(call all-java-files-under, src) -LOCAL_MODULE := hamcrest -LOCAL_SDK_VERSION := 25 -LOCAL_MODULE_TAGS := optional -include $(BUILD_STATIC_JAVA_LIBRARY) -include $(call all-makefiles-under, $(LOCAL_PATH)) +include $(call all-subdir-makefiles) |