diff options
| author | Brian Carlstrom <bdc@google.com> | 2013-03-27 17:04:05 -0700 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2013-03-27 17:04:05 -0700 |
| commit | 8c374054b3d4ffc6e77a1b1d6248215d0ce3e462 (patch) | |
| tree | 499fc3e15aad7bb0b1f0810267e25aa93d8bfb22 /core | |
| parent | 4b7359662b532484f9a329f58b7f5c3c016a5ac5 (diff) | |
| parent | 9a3b17d1847f7477362d05e1139ad9ce82472652 (diff) | |
| download | build-8c374054b3d4ffc6e77a1b1d6248215d0ce3e462.zip build-8c374054b3d4ffc6e77a1b1d6248215d0ce3e462.tar.gz build-8c374054b3d4ffc6e77a1b1d6248215d0ce3e462.tar.bz2 | |
resolved conflicts for merge of 9a3b17d1 to jb-mr2-dev
Change-Id: I7699f3c6ef3fcf1f16bbfff05f7b238328f8fbd6
Diffstat (limited to 'core')
| -rw-r--r-- | core/host_java_library.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/core/host_java_library.mk b/core/host_java_library.mk index d6a688f..cda6e10 100644 --- a/core/host_java_library.mk +++ b/core/host_java_library.mk @@ -50,6 +50,8 @@ endif # LOCAL_BUILD_HOST_DEX include $(BUILD_SYSTEM)/base_rules.mk +$(full_classes_compiled_jar): PRIVATE_JAVAC_DEBUG_FLAGS := -g + java_alternative_checked_module := # The layers file allows you to enforce a layering between java packages. |