diff options
author | Sasha Smundak <asmundak@google.com> | 2019-01-11 17:42:17 -0800 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-01-11 17:42:17 -0800 |
commit | b8e66deb93735878f83ecf2064a42ba34b6a0dd5 (patch) | |
tree | 269b4ca48b3c9e39c31936068f0ae90ef9548e31 | |
parent | 7bd1854f15fdbc3276725ca199e3ce26fa258d0a (diff) | |
parent | ef8a4f27bd881fb4b666a8d3b4a5aefca847775e (diff) | |
download | Launcher2-b8e66deb93735878f83ecf2064a42ba34b6a0dd5.tar.gz |
Merge "Convert Android.mk file to Android.bp"
am: ef8a4f27bd
Change-Id: Idb90e1d1369dce158b55751406f3dfb3b7c5a127
-rw-r--r-- | Android.bp | 35 | ||||
-rw-r--r-- | Android.mk | 44 | ||||
-rw-r--r-- | tests/Android.mk | 16 | ||||
-rw-r--r-- | tests/stress/Android.bp | 27 | ||||
-rw-r--r-- | tests/stress/Android.mk | 33 |
5 files changed, 62 insertions, 93 deletions
diff --git a/Android.bp b/Android.bp new file mode 100644 index 00000000..519151c6 --- /dev/null +++ b/Android.bp @@ -0,0 +1,35 @@ +// +// Copyright (C) 2008 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: "Launcher2", + static_libs: [ + "android-common", + "android-support-v4", + "android-support-v13", + ], + srcs: [ + "src/**/*.java", + ], + sdk_version: "current", + certificate: "shared", + privileged: true, + overrides: ["Home"], + optimize: { + proguard_flags_files: ["proguard.flags"], + }, + resource_dirs: ["res"], +} diff --git a/Android.mk b/Android.mk deleted file mode 100644 index 99dde75b..00000000 --- a/Android.mk +++ /dev/null @@ -1,44 +0,0 @@ -# -# Copyright (C) 2008 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_STATIC_JAVA_LIBRARIES := android-common - -LOCAL_STATIC_ANDROID_LIBRARIES := \ - android-support-v4 \ - android-support-v13 - -LOCAL_SRC_FILES := $(call all-java-files-under, src) $(call all-renderscript-files-under, src) -LOCAL_SDK_VERSION := current - -LOCAL_PACKAGE_NAME := Launcher2 -LOCAL_CERTIFICATE := shared -LOCAL_PRIVILEGED_MODULE := true - -LOCAL_OVERRIDES_PACKAGES := Home - -LOCAL_PROGUARD_FLAG_FILES := proguard.flags - -LOCAL_USE_AAPT2 := true -LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res - -include $(BUILD_PACKAGE) - -include $(call all-makefiles-under,$(LOCAL_PATH)) diff --git a/tests/Android.mk b/tests/Android.mk deleted file mode 100644 index e33169cc..00000000 --- a/tests/Android.mk +++ /dev/null @@ -1,16 +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 $(call all-makefiles-under,$(LOCAL_PATH)) diff --git a/tests/stress/Android.bp b/tests/stress/Android.bp new file mode 100644 index 00000000..6a9912db --- /dev/null +++ b/tests/stress/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: "LauncherRotationStressTest", + libs: [ + "android.test.runner", + "android.test.base", + ], + static_libs: ["junit"], + srcs: ["src/**/*.java"], + platform_apis: true, + certificate: "shared", + instrumentation_for: "Launcher2", +} diff --git a/tests/stress/Android.mk b/tests/stress/Android.mk deleted file mode 100644 index c1b2069b..00000000 --- a/tests/stress/Android.mk +++ /dev/null @@ -1,33 +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) - -# We only want this apk build for tests. -LOCAL_MODULE_TAGS := tests - -LOCAL_JAVA_LIBRARIES := android.test.runner android.test.base -LOCAL_STATIC_JAVA_LIBRARIES := junit - -LOCAL_SRC_FILES := $(call all-java-files-under, src) - -LOCAL_PACKAGE_NAME := LauncherRotationStressTest -LOCAL_PRIVATE_PLATFORM_APIS := true - -LOCAL_CERTIFICATE := shared - -LOCAL_INSTRUMENTATION_FOR := Launcher2 - -include $(BUILD_PACKAGE) |