diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2017-10-13 08:09:05 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-10-13 08:09:05 +0000 |
commit | 73556320dbc887f9a6bf31ed58666e099fe371de (patch) | |
tree | 29674f3f18ba63345cd6ba0efaf719857207d3be | |
parent | 3408e0e6c43de58ba35b06e6c4b612dc86d342c9 (diff) | |
parent | 086d9d51dc7c71ce8713f95e27efe53cb3363a8e (diff) | |
download | hamcrest-73556320dbc887f9a6bf31ed58666e099fe371de.tar.gz |
Snap for 4393550 from 086d9d51dc7c71ce8713f95e27efe53cb3363a8e to pi-release
Change-Id: I03c991e18be66372feee09708d5d22490b99e785
-rw-r--r-- | Android.bp | 20 | ||||
-rw-r--r-- | Android.mk | 17 | ||||
-rw-r--r-- | hamcrest-core/Android.bp | 23 | ||||
-rw-r--r-- | hamcrest-core/Android.mk | 46 | ||||
-rw-r--r-- | hamcrest-library/Android.bp | 24 | ||||
-rw-r--r-- | hamcrest-library/Android.mk | 40 |
6 files changed, 67 insertions, 103 deletions
diff --git a/Android.bp b/Android.bp new file mode 100644 index 0000000..ec07728 --- /dev/null +++ b/Android.bp @@ -0,0 +1,20 @@ +// Copyright (C) 2017 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. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// +// + +subdirs = [ + "hamcrest-core", + "hamcrest-library", +] diff --git a/Android.mk b/Android.mk deleted file mode 100644 index 41a41d0..0000000 --- a/Android.mk +++ /dev/null @@ -1,17 +0,0 @@ -# -# 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. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -include $(call all-subdir-makefiles) diff --git a/hamcrest-core/Android.bp b/hamcrest-core/Android.bp new file mode 100644 index 0000000..711ebfe --- /dev/null +++ b/hamcrest-core/Android.bp @@ -0,0 +1,23 @@ +// Copyright (C) 2012 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. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// +// + +java_library_static { + name: "hamcrest", + host_supported: true, + hostdex: true, + srcs: ["src/main/java/**/*.java"], + sdk_version: "25", +} diff --git a/hamcrest-core/Android.mk b/hamcrest-core/Android.mk deleted file mode 100644 index a6acc8f..0000000 --- a/hamcrest-core/Android.mk +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright (C) 2012 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. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# 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/main/java) -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/main/java) -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/main/java) -LOCAL_MODULE := hamcrest -LOCAL_SDK_VERSION := 25 -LOCAL_MODULE_TAGS := optional -include $(BUILD_STATIC_JAVA_LIBRARY) - -include $(call all-makefiles-under, $(LOCAL_PATH)) diff --git a/hamcrest-library/Android.bp b/hamcrest-library/Android.bp new file mode 100644 index 0000000..c91c7c6 --- /dev/null +++ b/hamcrest-library/Android.bp @@ -0,0 +1,24 @@ +// Copyright (C) 2014 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. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// +// + +java_library_static { + name: "hamcrest-library", + host_supported: true, + srcs: ["src/main/java/**/*.java"], + + libs: ["hamcrest"], + sdk_version: "8", +} diff --git a/hamcrest-library/Android.mk b/hamcrest-library/Android.mk deleted file mode 100644 index 792252a..0000000 --- a/hamcrest-library/Android.mk +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright (C) 2014 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. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# 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/main/java) -LOCAL_MODULE := hamcrest-library-host -LOCAL_JAVA_LIBRARIES := hamcrest-host -LOCAL_MODULE_TAGS := optional -include $(BUILD_HOST_JAVA_LIBRARY) - -#------------------------------- -# build a target jar - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := $(call all-java-files-under, src/main/java) - -LOCAL_MODULE := hamcrest-library -LOCAL_JAVA_LIBRARIES := hamcrest -LOCAL_SDK_VERSION := 8 -LOCAL_MODULE_TAGS := optional - -include $(BUILD_STATIC_JAVA_LIBRARY) |