Convert Android.mk to Android.bp.

Test: "mma -j128" built libxkbcommon for arm/x86/x86_64.

Change-Id: I4ac94f506364df453edec1dd309199e5a6a4fb90

3 files changed, 62 insertions, 113 deletions

diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..bdc1e70
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,62 @@
+// Copyright (C) 2017 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_static {
+    srcs: [
+        "xkbcommon/src/compose/parser.c",
+        "xkbcommon/src/compose/paths.c",
+        "xkbcommon/src/compose/state.c",
+        "xkbcommon/src/compose/table.c",
+        "xkbcommon/src/xkbcomp/action.c",
+        "xkbcommon/src/xkbcomp/ast-build.c",
+        "xkbcommon/src/xkbcomp/compat.c",
+        "xkbcommon/src/xkbcomp/expr.c",
+        "xkbcommon/src/xkbcomp/include.c",
+        "xkbcommon/src/xkbcomp/keycodes.c",
+        "xkbcommon/src/xkbcomp/keymap.c",
+        "xkbcommon/src/xkbcomp/keymap-dump.c",
+        "xkbcommon/src/xkbcomp/keywords.c",
+        "xkbcommon/src/xkbcomp/parser.c",
+        "xkbcommon/src/xkbcomp/rules.c",
+        "xkbcommon/src/xkbcomp/scanner.c",
+        "xkbcommon/src/xkbcomp/symbols.c",
+        "xkbcommon/src/xkbcomp/types.c",
+        "xkbcommon/src/xkbcomp/vmod.c",
+        "xkbcommon/src/xkbcomp/xkbcomp.c",
+        "xkbcommon/src/atom.c",
+        "xkbcommon/src/context.c",
+        "xkbcommon/src/context-priv.c",
+        "xkbcommon/src/keysym.c",
+        "xkbcommon/src/keysym-utf.c",
+        "xkbcommon/src/keymap.c",
+        "xkbcommon/src/keymap-priv.c",
+        "xkbcommon/src/state.c",
+        "xkbcommon/src/text.c",
+        "xkbcommon/src/utf8.c",
+        "xkbcommon/src/utils.c",
+    ],
+    cflags: [
+        "-std=c99",
+        "-Wno-unused-parameter",
+        "-Wno-missing-field-initializers",
+        "-DXLOCALEDIR=\"/usr/share/X11/locale\"",
+        "-DDEFAULT_XKB_LAYOUT=\"us\"",
+        "-DDEFAULT_XKB_MODEL=\"pc105\"",
+        "-DDEFAULT_XKB_RULES=\"evdev\"",
+        "-DDFLT_XKB_CONFIG_ROOT=\"/usr/share/X11/xkb\"",
+    ],
+    local_include_dirs: ["xkbcommon/src"],
+    export_include_dirs: ["xkbcommon"],
+    name: "libxkbcommon",
+}
diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index 073156e..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,69 +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_SRC_FILES:= \
-	xkbcommon/src/compose/parser.c \
-	xkbcommon/src/compose/paths.c \
-	xkbcommon/src/compose/state.c \
-	xkbcommon/src/compose/table.c \
-	xkbcommon/src/xkbcomp/action.c \
-	xkbcommon/src/xkbcomp/ast-build.c \
-	xkbcommon/src/xkbcomp/compat.c \
-	xkbcommon/src/xkbcomp/expr.c \
-	xkbcommon/src/xkbcomp/include.c \
-	xkbcommon/src/xkbcomp/keycodes.c \
-	xkbcommon/src/xkbcomp/keymap.c \
-	xkbcommon/src/xkbcomp/keymap-dump.c \
-	xkbcommon/src/xkbcomp/keywords.c \
-	xkbcommon/src/xkbcomp/parser.c \
-	xkbcommon/src/xkbcomp/rules.c \
-	xkbcommon/src/xkbcomp/scanner.c \
-	xkbcommon/src/xkbcomp/symbols.c \
-	xkbcommon/src/xkbcomp/types.c \
-	xkbcommon/src/xkbcomp/vmod.c \
-	xkbcommon/src/xkbcomp/xkbcomp.c \
-	xkbcommon/src/atom.c \
-	xkbcommon/src/context.c \
-	xkbcommon/src/context-priv.c \
-	xkbcommon/src/keysym.c \
-	xkbcommon/src/keysym-utf.c \
-	xkbcommon/src/keymap.c \
-	xkbcommon/src/keymap-priv.c \
-	xkbcommon/src/state.c \
-	xkbcommon/src/text.c \
-	xkbcommon/src/utf8.c \
-	xkbcommon/src/utils.c \
-
-LOCAL_CFLAGS += \
-	-std=c99 \
-	-Wno-unused-parameter \
-	-Wno-missing-field-initializers \
-	-DXLOCALEDIR='"/usr/share/X11/locale"' \
-	-DDEFAULT_XKB_LAYOUT='"us"' \
-	-DDEFAULT_XKB_MODEL='"pc105"' \
-	-DDEFAULT_XKB_RULES='"evdev"' \
-	-DDFLT_XKB_CONFIG_ROOT='"/usr/share/X11/xkb"' \
-
-LOCAL_C_INCLUDES := \
-	$(LOCAL_PATH)/xkbcommon \
-	$(LOCAL_PATH)/xkbcommon/src \
-
-LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/xkbcommon
-
-LOCAL_MODULE := libxkbcommon
-
-include $(BUILD_STATIC_LIBRARY)
diff --git a/xkbcommon/Android.mk b/xkbcommon/Android.mk
deleted file mode 100644
index 04a7014..0000000
--- a/xkbcommon/Android.mk
+++ /dev/null
@@ -1,44 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LIBXKBCOMMON_TOP := $(LOCAL_PATH)
-
-LIBXKBCOMMON_BUILT_MAKEFILES := \
-	$(LIBXKBCOMMON_TOP)/Android_build.mk
-
-LIBXKBCOMMON_CONFIGURE_TARGET := $(LIBXKBCOMMON_TOP)/Makefile
-
-$(LIBXKBCOMMON_CONFIGURE_TARGET): $(CONFIGURE_DEPENDENCIES)
-	cd $(LIBXKBCOMMON_TOP) && autoreconf -fiv
-	cd $(LIBXKBCOMMON_TOP) && \
-		CC="$(CONFIGURE_CC)" \
-		CFLAGS="$(CONFIGURE_CFLAGS)" \
-		LD=$(TARGET_LD) \
-		LDFLAGS="$(CONFIGURE_LDFLAGS)" \
-		CPP=$(CONFIGURE_CPP) \
-		CPPFLAGS="$(CONFIGURE_CPPFLAGS)" \
-		PKG_CONFIG_LIBDIR=$(CONFIGURE_PKG_CONFIG_LIBDIR) \
-		PKG_CONFIG_TOP_BUILD_DIR=$(PKG_CONFIG_TOP_BUILD_DIR) \
-		./configure --host=arm-linux-androideabi \
-		--prefix /system \
-		--with-xkb-config-root=/system/usr/share/xkb
-
-$(LIBXKBCOMMON_BUILT_MAKEFILES): $(LIBXKBCOMMON_CONFIGURE_TARGET)
-	make -C $(dir $@) $(notdir $@)
-
-.PHONY: libxkbcommon-reset libxkbcommon-clean
-
-libxkbcommon-reset:
-	cd $(LIBXKBCOMMON_TOP) && \
-	git clean -qdxf && \
-	git reset --hard HEAD
-
-libxkbcommon-clean:
-
-contrib-reset: libxkbcommon-reset
-contrib-clean: libxkbcommon-clean
-
-CONFIGURE_PKG_CONFIG_LIBDIR := $(CONFIGURE_PKG_CONFIG_LIBDIR):$(abspath $(LIBXKBCOMMON_TOP))
-
-include $(LIBXKBCOMMON_BUILT_MAKEFILES)
-