Merge "Convert bootanimation to Android.bp"
diff --git a/cmds/bootanimation/Android.bp b/cmds/bootanimation/Android.bp
new file mode 100644
index 0000000..60a1cfb
--- /dev/null
+++ b/cmds/bootanimation/Android.bp
@@ -0,0 +1,87 @@
+cc_defaults {
+ name: "bootanimation_defaults",
+
+ cflags: [
+ "-DGL_GLEXT_PROTOTYPES",
+ "-DEGL_EGLEXT_PROTOTYPES",
+
+ "-Wall",
+ "-Werror",
+ "-Wunused",
+ "-Wunreachable-code",
+ ],
+
+ shared_libs: [
+ "libandroidfw",
+ "libbase",
+ "libbinder",
+ "libcutils",
+ "liblog",
+ "libutils",
+ ],
+}
+
+// bootanimation executable
+// =========================================================
+
+cc_binary {
+ name: "bootanimation",
+ defaults: ["bootanimation_defaults"],
+
+ shared_libs: [
+ "libOpenSLES",
+ "libbootanimation",
+ ],
+
+ srcs: [
+ "BootAnimationUtil.cpp",
+
+ "bootanimation_main.cpp",
+ "audioplay.cpp",
+ ],
+
+ product_variables: {
+ product_is_iot: {
+ shared_libs: [
+ "libandroidthings",
+ "libchrome",
+ ],
+ srcs: [
+ "iot/iotbootanimation_main.cpp",
+ "iot/BootAction.cpp",
+ "iot/BootParameters.cpp",
+ ],
+ exclude_srcs: [
+ "bootanimation_main.cpp",
+ "audioplay.cpp",
+ ],
+ },
+ },
+
+ init_rc: ["bootanim.rc"],
+}
+
+// libbootanimation
+// ===========================================================
+
+cc_library_shared {
+ name: "libbootanimation",
+ defaults: ["bootanimation_defaults"],
+
+ srcs: ["BootAnimation.cpp"],
+
+ shared_libs: [
+ "libui",
+ "libhwui",
+ "libEGL",
+ "libGLESv1_CM",
+ "libgui",
+ "libtinyalsa",
+ ],
+
+ product_variables: {
+ product_is_iot: {
+ init_rc: ["iot/bootanim_iot.rc"],
+ },
+ },
+}
diff --git a/cmds/bootanimation/Android.mk b/cmds/bootanimation/Android.mk
deleted file mode 100644
index e5d35b3..0000000
--- a/cmds/bootanimation/Android.mk
+++ /dev/null
@@ -1,96 +0,0 @@
-bootanimation_CommonCFlags = -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES
-bootanimation_CommonCFlags += -Wall -Werror -Wunused -Wunreachable-code
-
-
-# bootanimation executable
-# =========================================================
-
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_CFLAGS += ${bootanimation_CommonCFlags}
-
-LOCAL_SHARED_LIBRARIES := \
- libOpenSLES \
- libandroidfw \
- libbase \
- libbinder \
- libbootanimation \
- libcutils \
- liblog \
- libutils \
-
-LOCAL_SRC_FILES:= \
- BootAnimationUtil.cpp \
-
-ifeq ($(PRODUCT_IOT),true)
-
-LOCAL_SHARED_LIBRARIES += \
- libandroidthings \
- libchrome \
-
-LOCAL_SRC_FILES += \
- iot/iotbootanimation_main.cpp \
- iot/BootAction.cpp \
- iot/BootParameters.cpp \
-
-else
-
-LOCAL_SRC_FILES += \
- bootanimation_main.cpp \
- audioplay.cpp \
-
-endif # PRODUCT_IOT
-
-LOCAL_MODULE:= bootanimation
-
-LOCAL_INIT_RC := bootanim.rc
-
-ifdef TARGET_32_BIT_SURFACEFLINGER
-LOCAL_32_BIT_ONLY := true
-endif
-
-include $(BUILD_EXECUTABLE)
-
-
-# libbootanimation
-# ===========================================================
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := libbootanimation
-LOCAL_CFLAGS += ${bootanimation_CommonCFlags}
-
-LOCAL_SRC_FILES:= \
- BootAnimation.cpp
-
-LOCAL_CFLAGS += ${bootanimation_CommonCFlags}
-
-LOCAL_C_INCLUDES += \
- external/tinyalsa/include \
- frameworks/wilhelm/include
-
-LOCAL_SHARED_LIBRARIES := \
- libcutils \
- liblog \
- libandroidfw \
- libutils \
- libbinder \
- libui \
- libhwui \
- libEGL \
- libGLESv1_CM \
- libgui \
- libtinyalsa \
- libbase
-
-ifeq ($(PRODUCT_IOT),true)
-
-LOCAL_INIT_RC := iot/bootanim_iot.rc
-
-endif # PRODUCT_IOT
-
-ifdef TARGET_32_BIT_SURFACEFLINGER
-LOCAL_32_BIT_ONLY := true
-endif
-
-include ${BUILD_SHARED_LIBRARY}