Convert Android.mk->Android.bp am: 475aad7be8 am: bbf4f35ea3 am: 9979077883

am: 7a07142552

Change-Id: I4c89fdcea0c63fb0830592478e518cbba95ff6d0

2 files changed, 101 insertions, 47 deletions

diff --git a/Android.bp b/Android.bp
new file mode 100644
index 00000000..df8d10c3
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,101 @@
+// 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.
+
+cc_library_shared {
+    name: "libcups",
+
+    sdk_version: "current",
+
+    srcs: [
+        "cups/array.c",
+        "cups/auth.c",
+        "cups/backchannel.c",
+        "cups/backend.c",
+        "cups/debug.c",
+        "cups/dest.c",
+        "cups/dest-job.c",
+        "cups/dest-localization.c",
+        "cups/dest-options.c",
+        "cups/dir.c",
+        "cups/encode.c",
+        "cups/file.c",
+        "cups/getdevices.c",
+        "cups/getifaddrs.c",
+        "cups/getputfile.c",
+        "cups/globals.c",
+        "cups/hash.c",
+        "cups/http.c",
+        "cups/http-addr.c",
+        "cups/http-addrlist.c",
+        "cups/http-support.c",
+        "cups/ipp.c",
+        "cups/ipp-support.c",
+        "cups/langprintf.c",
+        "cups/language.c",
+        "cups/md5.c",
+        "cups/md5passwd.c",
+        "cups/notify.c",
+        "cups/options.c",
+        "cups/ppd.c",
+        "cups/ppd-attr.c",
+        "cups/ppd-cache.c",
+        "cups/ppd-conflicts.c",
+        "cups/ppd-custom.c",
+        "cups/ppd-emit.c",
+        "cups/ppd-localize.c",
+        "cups/ppd-mark.c",
+        "cups/ppd-page.c",
+        "cups/ppd-util.c",
+        "cups/pwg-media.c",
+        "cups/request.c",
+        "cups/sidechannel.c",
+        "cups/snmp.c",
+        "cups/snprintf.c",
+        "cups/string.c",
+        "cups/tempfile.c",
+        "cups/thread.c",
+        "cups/transcode.c",
+        "cups/usersys.c",
+        "cups/util.c",
+        "filter/error.c",
+        "filter/raster.c",
+    ],
+
+    cflags: [
+        "-D_PPD_DEPRECATED=",
+        "-Wextra",
+        "-Wno-unused-parameter",
+        "-Wno-sign-compare",
+        "-Wno-missing-field-initializers",
+        "-Wno-error",
+        "-Wno-implicit-function-declaration",
+    ],
+
+    export_include_dirs: [
+        "cups",
+        "filter",
+        "."
+    ],
+
+    arch: {
+        arm: {
+            instruction_set: "arm",
+        },
+    },
+
+    shared_libs: [
+        "libz",
+        "liblog",
+    ],
+}
diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index 0dc3ee1c..00000000
--- a/Android.mk
+++ /dev/null
@@ -1,47 +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_ARM_MODE := arm
-LOCAL_SDK_VERSION := current
-
-LOCAL_SRC_FILES := \
-      cups/array.c cups/auth.c cups/backchannel.c cups/backend.c \
-      cups/debug.c cups/dest.c cups/dest-job.c cups/dest-localization.c \
-      cups/dest-options.c cups/dir.c cups/encode.c cups/file.c \
-      cups/getdevices.c cups/getifaddrs.c cups/getputfile.c cups/globals.c \
-      cups/hash.c cups/http.c cups/http-addr.c cups/http-addrlist.c \
-      cups/http-support.c cups/ipp.c cups/ipp-support.c cups/langprintf.c \
-      cups/language.c cups/md5.c cups/md5passwd.c cups/notify.c \
-      cups/options.c cups/ppd.c cups/ppd-attr.c cups/ppd-cache.c \
-      cups/ppd-conflicts.c cups/ppd-custom.c cups/ppd-emit.c \
-      cups/ppd-localize.c cups/ppd-mark.c cups/ppd-page.c cups/ppd-util.c \
-      cups/pwg-media.c cups/request.c cups/sidechannel.c cups/snmp.c \
-      cups/snprintf.c cups/string.c cups/tempfile.c cups/thread.c \
-      cups/transcode.c cups/usersys.c cups/util.c filter/error.c filter/raster.c
-
-LOCAL_CFLAGS += \
-      -D_PPD_DEPRECATED= -Wextra -Wno-unused-parameter \
-      -Wno-sign-compare -Wno-missing-field-initializers -Wno-error \
-      -Wno-implicit-function-declaration
-
-LOCAL_EXPORT_C_INCLUDE_DIRS := \
-      $(LOCAL_PATH)/cups $(LOCAL_PATH)/filters $(LOCAL_PATH)
-
-LOCAL_MODULE := libcups
-LOCAL_MODULE_TAGS := optional
-LOCAL_LDLIBS += -lz -llog
-include $(BUILD_SHARED_LIBRARY)