Commit 44640dc0f6c014dca770fbd58e9614320593f7b2

Authored by Arthur Bikmullin
1 parent 0ffac5ca

Merged with upstream

1   -Subproject commit 7bcd935b535ea59e4f3c44ce383d165fde924619
  1 +Subproject commit a95053659e0b4f7e245c79957f986f65aad2dab4
... ...
1   -Subproject commit 2833f3f61afde940c079951fb82a99bb25db13c0
  1 +Subproject commit 243be48e57d87f21eaaf975a8cbd21695cb5d5b4
... ...
... ... @@ -50,7 +50,8 @@ Class AndroidBuilder Extends Builder
50 50 SetEnv "ANDROID_SDK_DIR",tcc.ANDROID_PATH.Replace( "\","\\" )
51 51
52 52 SetConfigVar "ANDROID_MAINFEST_MAIN",GetConfigVar( "ANDROID_MANIFEST_MAIN" ).Replace( ";","~n" )+"~n"
53   - SetConfigVar "ANDROID_MAINFEST_APPLICATION",GetConfigVar( "ANDROID_MANIFEST_APPLICATION" ).Replace( ";","~n" )+"~n"
  53 + SetConfigVar "ANDROID_MAINFEST_APPLICATION",GetConfigVar("ANDROID_MANIFEST_APPLICATION").Replace(";", "~n")+"~n"
  54 + SetConfigVar "ANDROID_MAINFEST_ACTIVITY",GetConfigVar("ANDROID_MAINFEST_ACTIVITY").Replace(";", "~n")+"~n"
54 55
55 56 'create package
56 57 Local jpath:="src"
... ...
... ... @@ -43,7 +43,8 @@ Class AndroidNdkBuilder Extends Builder
43 43
44 44 SetConfigVar "ANDROID_SDK_DIR",tcc.ANDROID_PATH.Replace( "\","\\" )
45 45 SetConfigVar "ANDROID_MAINFEST_MAIN",GetConfigVar( "ANDROID_MANIFEST_MAIN" ).Replace( ";","~n" )+"~n"
46   - SetConfigVar "ANDROID_MAINFEST_APPLICATION",GetConfigVar( "ANDROID_MANIFEST_APPLICATION" ).Replace( ";","~n" )+"~n"
  46 + SetConfigVar "ANDROID_MAINFEST_APPLICATION",GetConfigVar("ANDROID_MANIFEST_APPLICATION").Replace(";", "~n")+"~n"
  47 + SetConfigVar "ANDROID_MAINFEST_ACTIVITY",GetConfigVar("ANDROID_MAINFEST_ACTIVITY").Replace(";", "~n")+"~n"
47 48
48 49 'create data dir
49 50 CreateDataDir "assets/monkey"
... ...
1   -Subproject commit 9f20f66fcdca5335a13d4c41c324cf26be1a1c67
  1 +Subproject commit 9cbf9eeceaaf2fd6a1fc564cf6090198f8f709e4
... ...
1   -Subproject commit 70f2f4afa2cbf982cd06410bbf11daabe060945b
  1 +Subproject commit d64f36ecff92ac8fdbe90d99a270919280ff14b3
... ...
1   -Subproject commit f71e914bdfa8e53228d1590f9fb7b156c06275c9
  1 +Subproject commit ca1c928f8b42e2a647f86e0861250caceeb868cd
... ...
1   -Subproject commit 1ede93027c68f346a3613f246fda06207ba56d50
  1 +Subproject commit 63c0da10012f08412f72d0b25374a36c2b2465c3
... ...