Skip to content

Commit bea1460

Browse files
AVS: SDK bump up changes (#415)
AVS: SDK bump up changes
1 parent c31420b commit bea1460

File tree

44 files changed

+509
-5026
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+509
-5026
lines changed

package/Config.in.host

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ menu "Host utilities"
4646
source "package/mtd/Config.in.host"
4747
source "package/mtools/Config.in.host"
4848
source "package/mxsldr/Config.in.host"
49+
source "package/nodejs/Config.in.host"
4950
source "package/omap-u-boot-utils/Config.in.host"
5051
source "package/openocd/Config.in.host"
5152
source "package/opkg-utils/Config.in.host"

package/amazon-alexa/Config.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
source "package/amazon-alexa/alexa-pryon-kwd/Config.in"
22
source "package/amazon-alexa/alexa-smart-screen-sdk/Config.in"
3+
source "package/amazon-alexa/apl-client-library/Config.in"
34
source "package/amazon-alexa/apl-core-library/Config.in"
45
source "package/amazon-alexa/avs-device-sdk/Config.in"

package/amazon-alexa/alexa-smart-screen-sdk/0005-Allow-in-source-builds.patch renamed to package/amazon-alexa/alexa-smart-screen-sdk/0001-Allow-in-source-builds.patch

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
diff --git a/modules/Alexa/build/BuildDefaults.cmake b/modules/Alexa/build/BuildDefaults.cmake
2-
index cc0f1f9..93e3e80 100644
2+
index 251b66e..9bdec43 100644
33
--- a/modules/Alexa/build/BuildDefaults.cmake
44
+++ b/modules/Alexa/build/BuildDefaults.cmake
5-
@@ -4,7 +4,7 @@
6-
list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/cmake)
5+
@@ -23,7 +23,7 @@ macro(include_once module)
6+
endmacro()
77

88
# Disallow out-of-source-builds.
9-
-include(DisallowOutOfSourceBuilds)
10-
+#include(DisallowOutOfSourceBuilds)
9+
-include_once(DisallowOutOfSourceBuilds)
10+
+#include_once(DisallowOutOfSourceBuilds)
1111

1212
# Setup default build options, like compiler flags and build type.
13-
include(BuildOptions)
13+
include_once(BuildOptions)

package/amazon-alexa/alexa-smart-screen-sdk/0001-Remove_additional_linking.patch

Lines changed: 0 additions & 16 deletions
This file was deleted.

package/amazon-alexa/alexa-smart-screen-sdk/0002-Allow_disabling_GUIClient_and_set_install_path.patch

Lines changed: 0 additions & 32 deletions
This file was deleted.
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
diff --git a/modules/Alexa/SampleApp/include/SampleApp/SampleApplication.h b/modules/Alexa/SampleApp/include/SampleApp/SampleApplication.h
2+
index df998ac..6e430f9 100644
3+
--- a/modules/Alexa/SampleApp/include/SampleApp/SampleApplication.h
4+
+++ b/modules/Alexa/SampleApp/include/SampleApp/SampleApplication.h
5+
@@ -154,7 +154,7 @@ public:
6+
alexaClientSDK::avsCommon::sdkInterfaces::ChannelVolumeInterface::Type speakerType);
7+
};
8+
9+
-private:
10+
+protected:
11+
/**
12+
* Initialize a SampleApplication.
13+
*

package/amazon-alexa/alexa-smart-screen-sdk/0003-Add_install_for_version_file.patch

Lines changed: 0 additions & 11 deletions
This file was deleted.
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
diff --git a/modules/CMakeLists.txt b/modules/CMakeLists.txt
2+
index 45145b6..8bfaed4 100644
3+
--- a/modules/CMakeLists.txt
4+
+++ b/modules/CMakeLists.txt
5+
@@ -6,5 +6,8 @@ project(modules LANGUAGES CXX)
6+
add_subdirectory("Alexa")
7+
if (NOT MSVC)
8+
# For UWP, build the GUIClient on UWP branch on a different platform
9+
- add_subdirectory("GUI")
10+
-endif()
11+
\ No newline at end of file
12+
+ set(JS_GUICLIENT_ENABLE OFF CACHE BOOL "Build the JS GUI Client")
13+
+ if(${JS_GUICLIENT_ENABLE})
14+
+ add_subdirectory("GUI")
15+
+ endif()
16+
+endif()
17+
diff --git a/modules/GUI/CMakeLists.txt b/modules/GUI/CMakeLists.txt
18+
index 4094546..feadbf3 100644
19+
--- a/modules/GUI/CMakeLists.txt
20+
+++ b/modules/GUI/CMakeLists.txt
21+
@@ -21,12 +21,13 @@ else()
22+
set(RTCSC_JS_PATH_VALUE "${CMAKE_CURRENT_SOURCE_DIR}/js/src/lib/liveView/RTCSC_Adapter_Stub")
23+
endif()
24+
25+
+set(JS_GUICLIENT_INSTALL_PATH "" CACHE STRING "The install path")
26+
add_custom_target(GUIClient ALL
27+
COMMAND "npm" "install"
28+
COMMAND "npm" "install" "${APL_CLIENT_JS_PATH}"
29+
COMMAND "npm" "install" "${RTCSC_JS_PATH_VALUE}"
30+
COMMAND "npm" "run" "build" "--"
31+
- "--output-path" "${CMAKE_CURRENT_BINARY_DIR}"
32+
+ "--output-path" "${JS_GUICLIENT_INSTALL_PATH}"
33+
"--env" "DISABLE_WEBSOCKET_SSL=${DISABLE_WEBSOCKET_SSL_VALUE}"
34+
"--env" "USE_UWP_CLIENT=${USE_UWP_CLIENT_VALUE}"
35+
"--env" "RTCSC_ENABLED=${RTCSC_ENABLED_VALUE}"

package/amazon-alexa/alexa-smart-screen-sdk/0004-Build-SampleApp-as-library.patch

Lines changed: 0 additions & 235 deletions
This file was deleted.

0 commit comments

Comments
 (0)