diff --git a/ts2panda/ts2abc/BUILD.gn b/ts2panda/ts2abc/BUILD.gn index 08bb3083bb87114f259bc5823351aced2ed51377..04c5c2a5e297887719cba35c054a65492f8eba00 100755 --- a/ts2panda/ts2abc/BUILD.gn +++ b/ts2panda/ts2abc/BUILD.gn @@ -11,12 +11,12 @@ # See the License for the specific language governing permissions and # limitations under the License. -if (!defined(ark_flag)) { +if (!defined(ark_independent_build)) { import("//ark/runtime_core/ark_config.gni") import("//build/ohos.gni") } else { - import("//build/ark.gni") import("//runtime_core/ark_config.gni") + import("$build_root/ark.gni") } jsoncpp_root = "$ark_third_party_root/jsoncpp" @@ -123,7 +123,7 @@ source_set("jsoncpp_set_static") { ] } -if (!defined(ark_flag)) { +if (!defined(ark_independent_build)) { ohos_static_library("jsoncpp_static") { deps = [ ":jsoncpp_set_static" ] use_exceptions = true diff --git a/ts2panda/ts2abc_config.gni b/ts2panda/ts2abc_config.gni index f3996af31afe7555fc9663e77f535cf1ccaa1576..496060cae95629a1433558aa91baf010307e063c 100755 --- a/ts2panda/ts2abc_config.gni +++ b/ts2panda/ts2abc_config.gni @@ -11,19 +11,20 @@ # See the License for the specific language governing permissions and # limitations under the License. -if (!defined(ark_flag)) { +if (!defined(ark_independent_build)) { import("//build/ohos.gni") import("//build/test.gni") + build_root = "//build" ts2abc_root = "//ark/ts2abc/ts2panda" } else { - import("//build/ark.gni") + import("$build_root/ark.gni") ts2abc_root = "//ts2abc/ts2panda" } declare_args() { - buildtool_linux = "//build/toolchain/linux:clang_x64" - buildtool_mac = "//build/toolchain/mac:clang_x64" - buildtool_win = "//build/toolchain/mingw:mingw_x86_64" + buildtool_linux = "$build_root/toolchain/linux:clang_x64" + buildtool_mac = "$build_root/toolchain/mac:clang_x64" + buildtool_win = "$build_root/toolchain/mingw:mingw_x86_64" nodejs_dir = "" node_path = ""