From ef7ed7a0015169e08e83e7cb283026c24673354a Mon Sep 17 00:00:00 2001 From: "yfriedman@chromium.org" Date: Tue, 29 May 2012 23:19:13 +0000 Subject: Fix ninja build for android. The primary issues is specifying the right path to PRODUCT_DIR (i.e. out/Release). The gyp generator for make specifies the absolute path but for ninja would use a relative path. Since the gyp targets don't line up with where the ant build files are located this causes failures such as base's java being generated in base/android/out/Release/... See: https://groups.google.com/forum/#!msg/gyp-developer/K2T_9obUya0/qq78_Ut-E-AJ for details. A couple of other minor fixes: - content java files are placed in out/Release/java/content to be consisent with other packages. - shared-libraries are now referenced by correct variables for apk-based tests - removed unused media/base/android/java/java.gyp (target is in media/media.gyp) TBR=mark@chromium.org,ben@chromium.org,rsleevi@chromium.org Review URL: https://chromiumcodereview.appspot.com/10386188 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139418 0039d316-1c4b-4281-b951-d872f2087c98 --- build/java.gypi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'build/java.gypi') diff --git a/build/java.gypi b/build/java.gypi index c05981d..67ebcb0 100644 --- a/build/java.gypi +++ b/build/java.gypi @@ -44,7 +44,7 @@ ], 'action': [ 'ant', - '-DPRODUCT_DIR=<(PRODUCT_DIR)', + '-DPRODUCT_DIR=<(ant_build_out)', '-DPACKAGE_NAME=<(package_name)', '-buildfile', '<(java_in_dir)/<(package_name).xml', -- cgit v1.1