Skip to content

Commit

Permalink
feat(core): change HIPPY_SDK_VERSION to VERSION_NAME
Browse files Browse the repository at this point in the history
  • Loading branch information
churchill-zhang authored and zoomchan-cxj committed Mar 16, 2023
1 parent e4174dd commit 6250ecf
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions android/sdk/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ android {
"-DANDROID_ARM_NEON=${INCLUDE_ABI_ARMEABI.toBoolean() ? 'FALSE' : 'TRUE'}",
"-DCMAKE_BUILD_TYPE=Release",
"-DANDROID_STL=$ANDROID_STL",
"-DHIPPY_SDK_VERSION=$VERSION_NAME",
"-DVERSION_NAME=$VERSION_NAME",
"-DV8_COMPONENT=$V8_COMPONENT",
"-DHIDDEN_LIBRARY_SYMBOL=$HIDDEN_LIBRARY_SYMBOL"

Expand Down Expand Up @@ -117,7 +117,7 @@ android {
"-DANDROID_ARM_NEON=${INCLUDE_ABI_ARMEABI.toBoolean() ? 'FALSE' : 'TRUE'}",
"-DCMAKE_BUILD_TYPE=Debug",
"-DANDROID_STL=$ANDROID_STL",
"-DHIPPY_SDK_VERSION=$VERSION_NAME",
"-DVERSION_NAME=$VERSION_NAME",
"-DV8_COMPONENT=$V8_COMPONENT",
"-DHIDDEN_LIBRARY_SYMBOL=$HIDDEN_LIBRARY_SYMBOL"

Expand Down
2 changes: 1 addition & 1 deletion core/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ add_library(${PROJECT_NAME} STATIC)
target_include_directories(${PROJECT_NAME} PUBLIC include)
target_compile_options(${PROJECT_NAME} PRIVATE ${COMPILE_OPTIONS})
target_link_libraries(${PROJECT_NAME} PRIVATE android log)
target_compile_definitions(${PROJECT_NAME} PRIVATE "HIPPY_SDK_VERSION=${HIPPY_SDK_VERSION}")
target_compile_definitions(${PROJECT_NAME} PRIVATE "VERSION_NAME=${VERSION_NAME}")
# endregion

# region vm
Expand Down
8 changes: 4 additions & 4 deletions core/include/core/vm/v8/snapshot_data.h
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@
constexpr uint32_t kMagicNumber = 0x66886688;

#define STR(x) #x
#define HIPPY_SDK_VERSION_STR(x) STR(x)
#define HIPPY_SDK_VERSION_STRING HIPPY_SDK_VERSION_STR(HIPPY_SDK_VERSION)
constexpr char kSdkVersion[] = HIPPY_SDK_VERSION_STRING;
#undef HIPPY_SDK_VERSION_STR
#define VERSION_NAME_STR(x) STR(x)
#define VERSION_NAME_STRING VERSION_NAME_STR(VERSION_NAME)
constexpr char kSdkVersion[] = VERSION_NAME_STRING;
#undef VERSION_NAME_STR
#undef STR

struct SnapshotData {
Expand Down

0 comments on commit 6250ecf

Please sign in to comment.