DO NOT MERGE

Merge pie-platform-release (PPRL.181205.001, history only) into master

Bug: 120502534
Change-Id: I68803f82bae399efe4e0f73ebe39392bc86e0622
diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..e7fd811
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,40 @@
+// Copyright (C) 2015 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.
+
+rootdev_CFLAGS = [
+    "-D_BSD_SOURCE",
+    "-D_FILE_OFFSET_BITS=64",
+    "-D_LARGEFILE_SOURCE",
+    "-include sys/sysmacros.h",
+    "-Wall",
+    "-Werror",
+    "-Wno-deprecated-declarations",
+    "-Wno-sign-compare",
+]
+
+// Build the shared library.
+cc_library_shared {
+    name: "librootdev",
+    cflags: rootdev_CFLAGS,
+    srcs: ["rootdev.c"],
+    export_include_dirs: ["."],
+}
+
+// Build the command line tool.
+cc_binary {
+    name: "rootdev",
+    cflags: rootdev_CFLAGS,
+    shared_libs: ["librootdev"],
+    srcs: ["main.c"],
+}
diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index e234891..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright (C) 2015 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)
-
-rootdev_CFLAGS := \
-  -D_BSD_SOURCE \
-  -D_FILE_OFFSET_BITS=64 \
-  -D_LARGEFILE_SOURCE \
-  -include sys/sysmacros.h \
-  -Wall -Werror \
-  -Wno-deprecated-declarations \
-  -Wno-sign-compare \
-
-# Build the shared library.
-include $(CLEAR_VARS)
-LOCAL_MODULE := librootdev
-LOCAL_CFLAGS += $(rootdev_CFLAGS)
-LOCAL_SRC_FILES := rootdev.c
-LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
-include $(BUILD_SHARED_LIBRARY)
-
-# Build the command line tool.
-include $(CLEAR_VARS)
-LOCAL_MODULE := rootdev
-LOCAL_CFLAGS += $(rootdev_CFLAGS)
-LOCAL_SHARED_LIBRARIES := librootdev
-LOCAL_SRC_FILES := main.c
-include $(BUILD_EXECUTABLE)