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

2 files changed, 1 insertions, 35 deletions

diff --git a/media/base/android/java/java.gyp b/media/base/android/java/java.gyp
deleted file mode 100644
index d59aec4..0000000
--- a/media/base/android/java/java.gyp
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright (c) 2012 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-{
-  'targets': [
-    {
-      'target_name': 'media_java',
-      'message': 'building media java sources',
-      'type': 'none',
-      'actions': [
-        {
-          'action_name': 'media_java',
-          'inputs': [
-            'media.xml',
-            'org/chromium/media/MediaPlayerListener.java',
-          ],
-          'dependencies': [
-            '<(DEPTH)/base/android/java/java.gyp:base_java',
-          ],
-          'outputs': [
-            '$(PRODUCT_DIR)/chromium_media.jar',
-          ],
-          'action': [
-            'ant',
-            '-DPRODUCT_DIR=<(PRODUCT_DIR)',
-            '-buildfile',
-            'media.xml',
-          ]
-        },
-      ],
-    },
-  ],
-}
diff --git a/media/base/android/java/media.xml b/media/base/android/java/media.xml
index 8516e3e..ab409f6 100644
--- a/media/base/android/java/media.xml
+++ b/media/base/android/java/media.xml
@@ -45,7 +45,7 @@
   <target name="dist" depends="compile"
           description="generate the distribution" >
     <!-- Create the distribution directory -->
-    <mkdir dir="${dist}/lib"/>
+    <mkdir dir="${out.dir}"/>
 
     <!-- Put everything in ${build} into the chromium_media.jar file -->
     <jar jarfile="${out.dir}/chromium_media.jar" basedir="${dest.dir}"/>