From 0fc171c6a6da39f7ea1bde2e2fe1fc80aa9833c2 Mon Sep 17 00:00:00 2001 From: Jaewoong Jung Date: Mon, 20 May 2019 13:40:53 -0700 Subject: [PATCH] Convert PrintRecommendationService to Android.bp. See build/soong/README.md for more information. Bug: 122332340 Test: Built and flashed to a Pixel device + TreeHugger Merged-In: I4ff0577a0c27b8a451e6aca2c62c2437481c2a0c Change-Id: I4ff0577a0c27b8a451e6aca2c62c2437481c2a0c --- .../PrintRecommendationService/Android.bp | 23 +++++++++++++ .../PrintRecommendationService/Android.mk | 33 ------------------- 2 files changed, 23 insertions(+), 33 deletions(-) create mode 100644 packages/PrintRecommendationService/Android.bp delete mode 100644 packages/PrintRecommendationService/Android.mk diff --git a/packages/PrintRecommendationService/Android.bp b/packages/PrintRecommendationService/Android.bp new file mode 100644 index 0000000000000..6d28bdb7943b8 --- /dev/null +++ b/packages/PrintRecommendationService/Android.bp @@ -0,0 +1,23 @@ +// 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_app { + name: "PrintRecommendationService", + srcs: ["src/**/*.java"], + sdk_version: "system_current", + static_libs: [ + "androidx.annotation_annotation", + "androidx.core_core", + ], +} diff --git a/packages/PrintRecommendationService/Android.mk b/packages/PrintRecommendationService/Android.mk deleted file mode 100644 index d27a6efe58d63..0000000000000 --- a/packages/PrintRecommendationService/Android.mk +++ /dev/null @@ -1,33 +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 := optional -LOCAL_USE_AAPT2 := true - -LOCAL_SRC_FILES := $(call all-java-files-under, src) - -LOCAL_PACKAGE_NAME := PrintRecommendationService - -LOCAL_SDK_VERSION := system_current - -LOCAL_STATIC_JAVA_LIBRARIES := androidx.annotation_annotation -LOCAL_STATIC_ANDROID_LIBRARIES := androidx.core_core - -include $(BUILD_PACKAGE) - -include $(call all-makefiles-under, $(LOCAL_PATH))