diff options
author | Colin Cross <ccross@android.com> | 2018-08-17 22:20:29 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2018-08-17 22:20:29 -0700 |
commit | 7aac8aa3535e0919acd81fc16879564d9e4e6bd7 (patch) | |
tree | 038b3a9cba3ba1bc8f7ca3d8b6c61fc7c2a3a35c | |
parent | 87df564860c651fc9ec82f948735a7ad6a72fb7a (diff) | |
parent | 9c31572f2f769497dbb0db6b5fb09555ed3df94b (diff) | |
download | datetimepicker-7aac8aa3535e0919acd81fc16879564d9e4e6bd7.tar.gz |
Merge "Convert frameworks/opt/datetimepicker to Android.bp" am: 9668ecd8bd
am: 9c31572f2f
Change-Id: Iea5eb9eae2e5736eef5c12e323a78210d7ab5db6
-rw-r--r-- | Android.bp | 37 | ||||
-rw-r--r-- | Android.mk | 39 |
2 files changed, 37 insertions, 39 deletions
diff --git a/Android.bp b/Android.bp new file mode 100644 index 0000000..4eab7f9 --- /dev/null +++ b/Android.bp @@ -0,0 +1,37 @@ +// Copyright (C) 2013 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_library { + name: "android-opt-datetimepicker", + + sdk_version: "current", + + srcs: [ + "src/**/*.java", + "src/**/*.logtags", + ], + + resource_dirs: ["res"], + + static_libs: [ + "android-support-annotations", + "android-support-compat", + "android-support-core-utils", + "android-support-core-ui", + ], + + optimize: { + proguard_flags_files: ["proguard.flags"], + }, +} diff --git a/Android.mk b/Android.mk deleted file mode 100644 index d84220d..0000000 --- a/Android.mk +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright (C) 2013 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 := android-opt-datetimepicker - -LOCAL_SDK_VERSION := current - -LOCAL_SRC_FILES := \ - $(call all-java-files-under, src) \ - $(call all-logtags-files-under, src) - -LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res - -LOCAL_USE_AAPT2 := true - -LOCAL_STATIC_JAVA_LIBRARIES := \ - android-support-annotations -LOCAL_STATIC_ANDROID_LIBRARIES := \ - android-support-compat \ - android-support-core-utils \ - android-support-core-ui - -LOCAL_PROGUARD_FLAG_FILES := proguard.flags - -include $(BUILD_STATIC_JAVA_LIBRARY) |