diff options
| author | Woongsuk Cho <ws77.cho@samsung.com> | 2018-11-07 19:21:13 +0900 |
|---|---|---|
| committer | 이형주/Tizen Platform Lab(SR)/Staff Engineer/삼성전자 <leee.lee@samsung.com> | 2018-11-12 08:05:44 +0900 |
| commit | 6ea547542ecf4d2b798b5e3c5e2673a4b96ace23 (patch) | |
| tree | 98ae56d0a4ff9ca25d6c771e36e218e069817b57 | |
| parent | b80976b7f822c8a502720178d8686aca21532add (diff) | |
| download | launcher-submit/tizen/20181112.072849.tar.gz launcher-submit/tizen/20181112.072849.tar.bz2 launcher-submit/tizen/20181112.072849.zip | |
Allow ni common initialization for arm architecture only.submit/tizen_5.0/20181112.073007submit/tizen/20181112.072849accepted/tizen/unified/20181113.085941accepted/tizen/5.0/unified/20181113.090018
AOTed dlls which generated under x86 architecture do not work correctly.
So, skip ni file generation except arm architecture.
NI_COMMON module can be used by other tools (for example vd-nitool)
So, add architecture checking code in the initNICommon() function
| -rw-r--r-- | NativeLauncher/installer-plugin/ni_common.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/NativeLauncher/installer-plugin/ni_common.cc b/NativeLauncher/installer-plugin/ni_common.cc index 4c5ca44..9ca229e 100644 --- a/NativeLauncher/installer-plugin/ni_common.cc +++ b/NativeLauncher/installer-plugin/ni_common.cc @@ -254,6 +254,7 @@ static void createCoreLibNI(bool enableR2R) int initNICommon(NiCommonOption* option) { +#if defined(__arm__) // get interval value const char* intervalFile = "/usr/share/dotnet.tizen/lib/crossgen_interval.txt"; std::ifstream inFile(intervalFile); @@ -274,6 +275,10 @@ int initNICommon(NiCommonOption* option) __tpa = getTPA(); return 0; +#else + fprintf(stderr, "crossgen supports arm architecture only. skip ni file generation\n"); + return -1; +#endif } void finalizeNICommon() |