3 files changed, 7 insertions, 10 deletions
diff --git a/cmds/bootanimation/Android.mk b/cmds/bootanimation/Android.mk
index dbd774992031..7e78d6c3ec21 100644
--- a/cmds/bootanimation/Android.mk
+++ b/cmds/bootanimation/Android.mk
@@ -25,9 +25,9 @@ LOCAL_SRC_FILES:= \
 
 ifeq ($(PRODUCT_IOT),true)
 
-LOCAL_SHARED_LIBRARIES += libchrome
-
-LOCAL_C_INCLUDES += external/libchrome
+LOCAL_SHARED_LIBRARIES += \
+    libandroidthings \
+    libchrome \
 
 LOCAL_SRC_FILES += \
     iot/iotbootanimation_main.cpp \
diff --git a/cmds/bootanimation/iot/BootAction.cpp b/cmds/bootanimation/iot/BootAction.cpp
index 2bc73439348b..665b4d918309 100644
--- a/cmds/bootanimation/iot/BootAction.cpp
+++ b/cmds/bootanimation/iot/BootAction.cpp
@@ -124,7 +124,7 @@ bool BootAction::init(const std::string& libraryPath) {
 
     float brightness = -1.0f;
     float volume = -1.0f;
-    std::vector<BootParameter> parameters;
+    std::vector<ABootActionParameter> parameters;
     SavedBootParameters saved_parameters;
 
     if (loadParameters(&saved_parameters)) {
diff --git a/cmds/bootanimation/iot/BootAction.h b/cmds/bootanimation/iot/BootAction.h
index d8bff75d7408..3cd43bed140c 100644
--- a/cmds/bootanimation/iot/BootAction.h
+++ b/cmds/bootanimation/iot/BootAction.h
@@ -21,6 +21,7 @@
 #include <string>
 
 #include <base/json/json_value_converter.h>
+#include <boot_action/boot_action.h>  // libandroidthings native API.
 #include <utils/RefBase.h>
 
 using base::JSONValueConverter;
@@ -29,11 +30,6 @@ namespace android {
 
 class BootAction : public RefBase {
 public:
-    struct BootParameter {
-      const char* key;
-      const char* value;
-    };
-
     struct SavedBootParameters {
       int brightness;
       int volume;
@@ -65,7 +61,8 @@ public:
     void shutdown();
 
 private:
-    typedef bool (*libInit)(const BootParameter* parameters, size_t num_parameters);
+    typedef bool (*libInit)(const ABootActionParameter* parameters,
+                            size_t num_parameters);
     typedef void (*libStartPart)(int partNumber, int playNumber);
     typedef void (*libShutdown)();