diff --git a/.bash_android b/.bash_android index 4e2fa3f..c6b9535 100644 --- a/.bash_android +++ b/.bash_android @@ -5,13 +5,16 @@ # # ln -s /Applications/android-dev/android-sdk-macosx /usr/local/opt/android-sdk # ln -s /Applications/android-dev/android-ndk-r10d /usr/local/opt/android-ndk -ANDROID_SDK_HOME='/usr/local/opt/android-sdk' -ANDROID_NDK_HOME='/usr/local/opt/android-ndk' +#ANDROID_SDK_HOME='/usr/local/opt/android-sdk' +#ANDROID_NDK_HOME='/usr/local/opt/android-ndk' +ANDROID_SDK_HOME='/Applications/android-dev/android-sdk-macosx' +ANDROID_NDK_HOME='/Applications/android-dev/android-ndk-r13b' +#ANDROID_NDK_HOME='/Applications/android-dev/android-ndk-r14-beta1' ANDROID_AVD_HOME=~ #/Users/j3g ANT_HOME=' /usr/local/opt/ant' JUNIT_HOME='/usr/local/lib/junit' BUILD_TOOLS_VER='25.0.2' - +7 # Standard Defatul Java SDK location # sudo ln -s /Library/Java/JavaVirtualMachines/jdk1.8.0_77.jdk/Contents/Home /Library/Java/JavaVirtualMachines/current diff --git a/settings/mac_bash.sublime-workspace b/settings/mac_bash.sublime-workspace index 3f3bb05..15b79ea 100644 --- a/settings/mac_bash.sublime-workspace +++ b/settings/mac_bash.sublime-workspace @@ -39,7 +39,7 @@ "file": "/Users/j3g/.bash_mac", "settings": { - "buffer_size": 618, + "buffer_size": 621, "line_ending": "Unix" } }, @@ -55,7 +55,7 @@ "file": "/Users/j3g/.bash_android", "settings": { - "buffer_size": 1881, + "buffer_size": 1880, "encoding": "UTF-8", "line_ending": "Unix" } @@ -96,7 +96,7 @@ "file": "/Users/j3g/.gitconfig", "settings": { - "buffer_size": 3587, + "buffer_size": 3619, "line_ending": "Unix" } }, @@ -129,7 +129,7 @@ "file": "/Users/j3g/.bash_history", "settings": { - "buffer_size": 10212, + "buffer_size": 7776, "line_ending": "Unix" } } @@ -856,15 +856,15 @@ "semi_transient": false, "settings": { - "buffer_size": 618, + "buffer_size": 621, "regions": { }, "selection": [ [ - 618, - 618 + 0, + 0 ] ], "settings": @@ -1215,15 +1215,15 @@ "semi_transient": false, "settings": { - "buffer_size": 1881, + "buffer_size": 1880, "regions": { }, "selection": [ [ - 1611, - 1611 + 0, + 0 ] ], "settings": @@ -1305,16 +1305,26 @@ }, "bracket_highlighter.regions": [ - "bh_angle", - "bh_angle_center", - "bh_angle_open", - "bh_angle_close", - "bh_angle_content", - "bh_curly", - "bh_curly_center", - "bh_curly_open", - "bh_curly_close", - "bh_curly_content", + "bh_square", + "bh_square_center", + "bh_square_open", + "bh_square_close", + "bh_square_content", + "bh_default", + "bh_default_center", + "bh_default_open", + "bh_default_close", + "bh_default_content", + "bh_single_quote", + "bh_single_quote_center", + "bh_single_quote_open", + "bh_single_quote_close", + "bh_single_quote_content", + "bh_round", + "bh_round_center", + "bh_round_open", + "bh_round_close", + "bh_round_content", "bh_tag", "bh_tag_center", "bh_tag_open", @@ -1325,41 +1335,31 @@ "bh_double_quote_open", "bh_double_quote_close", "bh_double_quote_content", - "bh_single_quote", - "bh_single_quote_center", - "bh_single_quote_open", - "bh_single_quote_close", - "bh_single_quote_content", - "bh_unmatched", - "bh_unmatched_center", - "bh_unmatched_open", - "bh_unmatched_close", - "bh_unmatched_content", + "bh_angle", + "bh_angle_center", + "bh_angle_open", + "bh_angle_close", + "bh_angle_content", + "bh_regex", + "bh_regex_center", + "bh_regex_open", + "bh_regex_close", + "bh_regex_content", "bh_c_define", "bh_c_define_center", "bh_c_define_open", "bh_c_define_close", "bh_c_define_content", - "bh_default", - "bh_default_center", - "bh_default_open", - "bh_default_close", - "bh_default_content", - "bh_round", - "bh_round_center", - "bh_round_open", - "bh_round_close", - "bh_round_content", - "bh_square", - "bh_square_center", - "bh_square_open", - "bh_square_close", - "bh_square_content", - "bh_regex", - "bh_regex_center", - "bh_regex_open", - "bh_regex_close", - "bh_regex_content" + "bh_curly", + "bh_curly_center", + "bh_curly_open", + "bh_curly_close", + "bh_curly_content", + "bh_unmatched", + "bh_unmatched_center", + "bh_unmatched_open", + "bh_unmatched_close", + "bh_unmatched_content" ], "incomplete_sync": null, "remote_loading": false, @@ -2095,7 +2095,7 @@ "semi_transient": false, "settings": { - "buffer_size": 3587, + "buffer_size": 3619, "regions": { }, @@ -2147,16 +2147,26 @@ }, "bracket_highlighter.regions": [ - "bh_angle", - "bh_angle_center", - "bh_angle_open", - "bh_angle_close", - "bh_angle_content", - "bh_curly", - "bh_curly_center", - "bh_curly_open", - "bh_curly_close", - "bh_curly_content", + "bh_square", + "bh_square_center", + "bh_square_open", + "bh_square_close", + "bh_square_content", + "bh_default", + "bh_default_center", + "bh_default_open", + "bh_default_close", + "bh_default_content", + "bh_single_quote", + "bh_single_quote_center", + "bh_single_quote_open", + "bh_single_quote_close", + "bh_single_quote_content", + "bh_round", + "bh_round_center", + "bh_round_open", + "bh_round_close", + "bh_round_content", "bh_tag", "bh_tag_center", "bh_tag_open", @@ -2167,41 +2177,31 @@ "bh_double_quote_open", "bh_double_quote_close", "bh_double_quote_content", - "bh_single_quote", - "bh_single_quote_center", - "bh_single_quote_open", - "bh_single_quote_close", - "bh_single_quote_content", - "bh_unmatched", - "bh_unmatched_center", - "bh_unmatched_open", - "bh_unmatched_close", - "bh_unmatched_content", + "bh_angle", + "bh_angle_center", + "bh_angle_open", + "bh_angle_close", + "bh_angle_content", + "bh_regex", + "bh_regex_center", + "bh_regex_open", + "bh_regex_close", + "bh_regex_content", "bh_c_define", "bh_c_define_center", "bh_c_define_open", "bh_c_define_close", "bh_c_define_content", - "bh_default", - "bh_default_center", - "bh_default_open", - "bh_default_close", - "bh_default_content", - "bh_round", - "bh_round_center", - "bh_round_open", - "bh_round_close", - "bh_round_content", - "bh_square", - "bh_square_center", - "bh_square_open", - "bh_square_close", - "bh_square_content", - "bh_regex", - "bh_regex_center", - "bh_regex_open", - "bh_regex_close", - "bh_regex_content" + "bh_curly", + "bh_curly_center", + "bh_curly_open", + "bh_curly_close", + "bh_curly_content", + "bh_unmatched", + "bh_unmatched_center", + "bh_unmatched_open", + "bh_unmatched_close", + "bh_unmatched_content" ], "csslint_options": { @@ -2473,7 +2473,7 @@ "semi_transient": false, "settings": { - "buffer_size": 10212, + "buffer_size": 7776, "regions": { },