diff options
author | Colin Cross <ccross@android.com> | 2018-08-17 18:44:30 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2018-08-17 18:44:30 -0700 |
commit | 584fe7a3252c735fbb74a5ca134d6378f610df39 (patch) | |
tree | ae0aa56df500fcb19c63297ad7385dc15093d40c | |
parent | c0246198be80c6a8185aba01707e3c6ecba21222 (diff) | |
parent | c626121cf0134ec4e412f45ce877544716ee2e97 (diff) | |
download | calendar-584fe7a3252c735fbb74a5ca134d6378f610df39.tar.gz |
Merge "Convert frameworks/opt/calendar to Android.bp" am: 8cc927f20f am: 2e046db8d3
am: c626121cf0
Change-Id: I5b8556d437d2c4b897b1e00769aa2c90c0d3986a
-rw-r--r-- | Android.bp | 19 | ||||
-rw-r--r-- | Android.mk | 26 | ||||
-rw-r--r-- | tests/Android.bp | 27 | ||||
-rw-r--r-- | tests/Android.mk | 25 |
4 files changed, 46 insertions, 51 deletions
diff --git a/Android.bp b/Android.bp new file mode 100644 index 0000000..4e3ea06 --- /dev/null +++ b/Android.bp @@ -0,0 +1,19 @@ +// Copyright (C) 2011 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 { + name: "calendar-common", + sdk_version: "15", + srcs: ["src/**/*.java"], +} diff --git a/Android.mk b/Android.mk deleted file mode 100644 index 2ba308e..0000000 --- a/Android.mk +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright (C) 2011 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) - -include $(CLEAR_VARS) -LOCAL_MODULE := calendar-common - -LOCAL_SDK_VERSION := 15 -LOCAL_SRC_FILES := $(call all-java-files-under, src) - -include $(BUILD_STATIC_JAVA_LIBRARY) - -# Build the test package -include $(call all-makefiles-under, $(LOCAL_PATH)) diff --git a/tests/Android.bp b/tests/Android.bp new file mode 100644 index 0000000..cdda049 --- /dev/null +++ b/tests/Android.bp @@ -0,0 +1,27 @@ +// Copyright (C) 2011 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. + +android_test { + name: "CalendarCommonTests", + sdk_version: "current", + srcs: ["src/**/*.java"], + libs: [ + "android.test.runner.stubs", + "android.test.base.stubs", + ], + static_libs: [ + "calendar-common", + "junit", + ], +} diff --git a/tests/Android.mk b/tests/Android.mk deleted file mode 100644 index d766463..0000000 --- a/tests/Android.mk +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright (C) 2011 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) -include $(CLEAR_VARS) - -LOCAL_MODULE_TAGS := tests -LOCAL_PACKAGE_NAME := CalendarCommonTests -LOCAL_SDK_VERSION := current -LOCAL_SRC_FILES := $(call all-java-files-under, src) -LOCAL_JAVA_LIBRARIES := android.test.runner.stubs android.test.base.stubs -LOCAL_STATIC_JAVA_LIBRARIES := calendar-common junit - -include $(BUILD_PACKAGE) |