From 278a04aa6b897ad0adccdb685464e2f209f6a108 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Wed, 3 Oct 2018 14:43:43 -0700 Subject: [PATCH] Convert PrintSpooler to Android.bp See build/soong/README.md for more information. Bug: 80095087 Test: atest PrintSpoolerOutOfProcessTests Change-Id: I9d641b9c480745ccee323aa0f758cd6a146e0638 --- packages/PrintSpooler/Android.bp | 38 ++++++++++++++++++ packages/PrintSpooler/Android.mk | 45 ---------------------- packages/PrintSpooler/tests/Android.mk | 19 --------- .../PrintSpooler/tests/outofprocess/Android.bp | 30 +++++++++++++++ .../PrintSpooler/tests/outofprocess/Android.mk | 30 --------------- 5 files changed, 68 insertions(+), 94 deletions(-) create mode 100644 packages/PrintSpooler/Android.bp delete mode 100644 packages/PrintSpooler/Android.mk delete mode 100644 packages/PrintSpooler/tests/Android.mk create mode 100644 packages/PrintSpooler/tests/outofprocess/Android.bp delete mode 100644 packages/PrintSpooler/tests/outofprocess/Android.mk diff --git a/packages/PrintSpooler/Android.bp b/packages/PrintSpooler/Android.bp new file mode 100644 index 000000000000..c40a81791302 --- /dev/null +++ b/packages/PrintSpooler/Android.bp @@ -0,0 +1,38 @@ +// 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_app { + name: "PrintSpooler", + + resource_dirs: ["res"], + + srcs: [ + "src/**/*.java", + "src/com/android/printspooler/renderer/IPdfRenderer.aidl", + "src/com/android/printspooler/renderer/IPdfEditor.aidl", + ], + + platform_apis: true, + + jni_libs: ["libprintspooler_jni"], + static_libs: [ + "android-support-v7-recyclerview", + "android-support-compat", + "android-support-media-compat", + "android-support-core-utils", + "android-support-core-ui", + "android-support-fragment", + "android-support-annotations", + ], +} diff --git a/packages/PrintSpooler/Android.mk b/packages/PrintSpooler/Android.mk deleted file mode 100644 index e356f38f10b3..000000000000 --- a/packages/PrintSpooler/Android.mk +++ /dev/null @@ -1,45 +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_TAGS := optional - -LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res -LOCAL_USE_AAPT2 := true -LOCAL_SRC_FILES := $(call all-java-files-under, src) -LOCAL_SRC_FILES += \ - src/com/android/printspooler/renderer/IPdfRenderer.aidl \ - src/com/android/printspooler/renderer/IPdfEditor.aidl - -LOCAL_PACKAGE_NAME := PrintSpooler -LOCAL_PRIVATE_PLATFORM_APIS := true - -LOCAL_JNI_SHARED_LIBRARIES := libprintspooler_jni -LOCAL_STATIC_ANDROID_LIBRARIES := \ - android-support-v7-recyclerview \ - android-support-compat \ - android-support-media-compat \ - android-support-core-utils \ - android-support-core-ui \ - android-support-fragment - -LOCAL_STATIC_JAVA_LIBRARIES := \ - android-support-annotations - -include $(BUILD_PACKAGE) - -include $(call all-makefiles-under, $(LOCAL_PATH)) diff --git a/packages/PrintSpooler/tests/Android.mk b/packages/PrintSpooler/tests/Android.mk deleted file mode 100644 index 83e00ce089d2..000000000000 --- a/packages/PrintSpooler/tests/Android.mk +++ /dev/null @@ -1,19 +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. - -LOCAL_PATH:= $(call my-dir) - -include $(CLEAR_VARS) - -include $(call all-makefiles-under, $(LOCAL_PATH)) diff --git a/packages/PrintSpooler/tests/outofprocess/Android.bp b/packages/PrintSpooler/tests/outofprocess/Android.bp new file mode 100644 index 000000000000..e88074ee4b9c --- /dev/null +++ b/packages/PrintSpooler/tests/outofprocess/Android.bp @@ -0,0 +1,30 @@ +// 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. + +android_test { + name: "PrintSpoolerOutOfProcessTests", + + srcs: ["src/**/*.java"], + + libs: ["android.test.runner.stubs"], + static_libs: [ + "android-support-test", + "ub-uiautomator", + "mockito-target-minus-junit4", + "print-test-util-lib", + ], + + sdk_version: "test_current", + test_suites: ["device-tests"], +} diff --git a/packages/PrintSpooler/tests/outofprocess/Android.mk b/packages/PrintSpooler/tests/outofprocess/Android.mk deleted file mode 100644 index 161a60021e65..000000000000 --- a/packages/PrintSpooler/tests/outofprocess/Android.mk +++ /dev/null @@ -1,30 +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. - -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_MODULE_TAGS := tests - -LOCAL_SRC_FILES := $(call all-java-files-under, src) - -LOCAL_JAVA_LIBRARIES := android.test.runner.stubs -LOCAL_STATIC_JAVA_LIBRARIES := android-support-test ub-uiautomator mockito-target-minus-junit4 print-test-util-lib - -LOCAL_PACKAGE_NAME := PrintSpoolerOutOfProcessTests -LOCAL_SDK_VERSION := current -LOCAL_COMPATIBILITY_SUITE := device-tests - -include $(BUILD_PACKAGE) -- 2.11.0