diff options
Diffstat (limited to 'base')
| -rw-r--r-- | base/android/base_jni_registrar.cc | 2 | ||||
| -rw-r--r-- | base/base.gyp | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/base/android/base_jni_registrar.cc b/base/android/base_jni_registrar.cc index a920037..06b0149 100644 --- a/base/android/base_jni_registrar.cc +++ b/base/android/base_jni_registrar.cc @@ -6,6 +6,7 @@ #include "base/basictypes.h" #include "base/android/build_info.h" +#include "base/android/locale_utils.h" #include "base/android/jni_android.h" #include "base/android/jni_registrar.h" #include "base/android/path_utils.h" @@ -19,6 +20,7 @@ namespace android { static RegistrationMethod kBaseRegisteredMethods[] = { { "BuildInfo", base::android::RegisterBuildInfo }, + { "LocaleUtils", base::android::RegisterLocaleUtils }, { "PathUtils", base::android::RegisterPathUtils }, { "SystemMessageHandler", base::RegisterSystemMessageHandler }, }; diff --git a/base/base.gyp b/base/base.gyp index 7b4f970..52df286 100644 --- a/base/base.gyp +++ b/base/base.gyp @@ -668,12 +668,13 @@ # a template, and builds them. 'action_name': 'generate_and_build', 'inputs': [ + '../testing/android/AndroidManifest.xml', '../testing/android/generate_native_test.py', '<(PRODUCT_DIR)/lib.target/libbase_unittests.so', '<(PRODUCT_DIR)/lib.java/chromium_base.jar' ], 'outputs': [ - '<(PRODUCT_DIR)/ChromeNativeTests_base_unittests-debug.apk', + '<(PRODUCT_DIR)/base_unittests_apk/base_unittests-debug.apk', ], 'action': [ '../testing/android/generate_native_test.py', |