diff options
| author | Sasha Smundak <asmundak@google.com> | 2019-01-11 20:53:47 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-01-11 20:53:47 -0800 |
| commit | 760d3f3a86f6cffa98e85f5626e7834eb0b6ea04 (patch) | |
| tree | 28e52010d6f597018eb5eeb0f9507f09e14c6a92 | |
| parent | 03c9584cc9709cffab53adb721e199fc0ea5e1cc (diff) | |
| parent | f83f0757832fca62ffead702a0bf111dd57e98df (diff) | |
| download | packages_apps_PhoneCommon-760d3f3a86f6cffa98e85f5626e7834eb0b6ea04.tar.gz packages_apps_PhoneCommon-760d3f3a86f6cffa98e85f5626e7834eb0b6ea04.tar.bz2 packages_apps_PhoneCommon-760d3f3a86f6cffa98e85f5626e7834eb0b6ea04.zip | |
Merge "Convert Android.mk file to Android.bp" am: af0ec78df9 am: ad0a14768c
am: f83f075783
Change-Id: I2a3c85b69fd50c6c17c8d8243778998b8ee2109d
| -rw-r--r-- | Android.bp | 20 | ||||
| -rw-r--r-- | Android.mk | 29 |
2 files changed, 20 insertions, 29 deletions
diff --git a/Android.bp b/Android.bp new file mode 100644 index 0000000..9036835 --- /dev/null +++ b/Android.bp @@ -0,0 +1,20 @@ +// Copyright 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. + +android_app { + name: "com.android.phone.common", + srcs: ["src/**/*.java"], + resource_dirs: ["res"], + sdk_version: "current", +} diff --git a/Android.mk b/Android.mk deleted file mode 100644 index c181927..0000000 --- a/Android.mk +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 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) -include $(CLEAR_VARS) - -LOCAL_MODULE_TAGS := optional - -LOCAL_USE_AAPT2 := true - -LOCAL_SRC_FILES := $(call all-java-files-under, src) -LOCAL_RESOURCE_FILES := $(addprefix $(LOCAL_PATH)/, res) - -LOCAL_PACKAGE_NAME := com.android.phone.common -LOCAL_SDK_VERSION := current - -include $(BUILD_PACKAGE) -include $(CLEAR_VARS) |