commit 177a8b1db6432472cdda1311219dd83c2a78d3b5
author Andreas Huber <andih@google.com> Thu Feb 09 10:08:48 2017 -0800
committer Andreas Huber <andih@google.com> Thu Feb 09 10:08:48 2017 -0800
tree be4c515a3aa446ae38cd35955593e96a2f97cede
parent 0bb0d4125aeb0d82ad5f810ec7bde1ffd2e0c863

Updated Java intermediates directory.

Java intermediates are now created in the common rather than the device-
specific generated sources subdirectory.

Bug: 33842609
Test: make
Change-Id: I37dba3a3cb9ba4e65f64150fa74e0d473c5e71e6

main.cpp

diff --git a/main.cpp b/main.cpp
index ba4e7ba..bd6c922 100644
--- a/main.cpp
+++ b/main.cpp
@@ -513,7 +513,8 @@
             << "-java"
             << staticSuffix
             << "\nLOCAL_MODULE_CLASS := JAVA_LIBRARIES\n\n"
-            << "intermediates := $(local-generated-sources-dir)\n\n"
+            << "intermediates := $(call local-generated-sources-dir, COMMON)"
+            << "\n\n"
             << "HIDL := $(HOST_OUT_EXECUTABLES)/"
             << hidl_gen
             << "$(HOST_EXECUTABLE_SUFFIX)";
@@ -559,7 +560,8 @@
             << libraryName
             << "-java-constants"
             << "\nLOCAL_MODULE_CLASS := JAVA_LIBRARIES\n\n"
-            << "intermediates := $(local-generated-sources-dir)\n\n"
+            << "intermediates := $(call local-generated-sources-dir, COMMON)"
+            << "\n\n"
             << "HIDL := $(HOST_OUT_EXECUTABLES)/"
             << hidl_gen
             << "$(HOST_EXECUTABLE_SUFFIX)";