diff options
| author | Ying Wang <wangying@android.com> | 2016-03-25 21:41:41 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-03-25 21:41:41 +0000 |
| commit | 11a8152a5fb89ef8153d00b38dba7012044396e6 (patch) | |
| tree | 436a3e05fe33dd4434d87b905d5b58823897385b | |
| parent | dbdc034e1c340018a576af751b849391e18a6175 (diff) | |
| parent | b4b3136dd8205b8c5017b750fe3d4b14eba75962 (diff) | |
| download | apache-harmony-11a8152a5fb89ef8153d00b38dba7012044396e6.tar.gz | |
Merge "Allow x86+arm multilib build."android-wear-n-preview-3android-wear-n-preview-1android-n-preview-3android-n-preview-2
| -rw-r--r-- | jdwp/Android_debug_config.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/jdwp/Android_debug_config.mk b/jdwp/Android_debug_config.mk index 4d53b17..940ebd1 100644 --- a/jdwp/Android_debug_config.mk +++ b/jdwp/Android_debug_config.mk @@ -54,7 +54,8 @@ ifdef TARGET_2ND_ARCH ifeq ($(TARGET_IS_64_BIT),true) jdwp_tests_target_abis := 64 32 else - $(error Unsupported multi-target configuration!) + jdwp_tests_target_abis := 32 + $(warning Unsupported multi-target configuration!) endif else ifeq ($(TARGET_IS_64_BIT),true) @@ -170,4 +171,3 @@ run-jdwp-tests-ri: $(HOST_OUT_JAVA_LIBRARIES)/apache-harmony-jdwp-tests-host.jar -Djpda.settings.syncPort=34016 \ -Djpda.settings.debuggeeJavaPath=java \ $(jdwp_test_suite_class_name) - |