Remove ant_build_out.

build/java_apk,gypi defaults to something based on <(PRODUCT_DIR) for
asset_location, so apparently it doesn't require an absolute path. Absolute
paths are yucky, and the `pwd -P` pattern has led someone else astray, so
remove it.

BUG=none
R=cjhopman@chromium.org
TBR=avi

Review URL: https://codereview.chromium.org/93023002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@237676 0039d316-1c4b-4281-b951-d872f2087c98

build/common.gypi

@@ -1387,10 +1387,6 @@
         # Location of the "readelf" binary.
         'android_readelf%' : '<!(/bin/echo -n <(android_toolchain)/*-readelf)',
 
-        # Provides an absolute path to PRODUCT_DIR (e.g. out/Release). Used
-        # to specify the output directory for Ant in the Android build.
-        'ant_build_out': '`cd <(PRODUCT_DIR) && pwd -P`',
-
         # Determines whether we should optimize JNI generation at the cost of
         # breaking assumptions in the build system that when inputs have changed
         # the outputs should always change as well.  This is meant purely for

chrome/chrome_android.gypi

@@ -63,7 +63,7 @@
         'manifest_package_name': 'org.chromium.chrome.testshell',
         'java_in_dir': 'android/testshell/java',
         'resource_dir': 'android/testshell/res',
-        'asset_location': '<(ant_build_out)/../assets/<(package_name)',
+        'asset_location': '<(PRODUCT_DIR)/../assets/<(package_name)',
         'native_lib_target': 'libchromiumtestshell',
         'additional_input_paths': [
           '<@(chrome_android_pak_output_resources)',

content/content_shell.gypi

@@ -790,7 +790,7 @@
             'resource_dir': 'shell/android/shell_apk/res',
             'native_lib_target': 'libcontent_shell_content_view',
             'additional_input_paths': ['<(PRODUCT_DIR)/content_shell/assets/content_shell.pak'],
-            'asset_location': '<(ant_build_out)/content_shell/assets',
+            'asset_location': '<(PRODUCT_DIR)/content_shell/assets',
           },
           'conditions': [
             ['android_webview_build==0', {

content/content_tests.gypi

@@ -1366,7 +1366,7 @@
             'resource_dir': 'shell/android/browsertests_apk/res',
             'native_lib_target': 'libcontent_browsertests',
             'additional_input_paths': ['<(PRODUCT_DIR)/content_shell/assets/content_shell.pak'],
-            'asset_location': '<(ant_build_out)/content_shell/assets',
+            'asset_location': '<(PRODUCT_DIR)/content_shell/assets',
           },
           'includes': [ '../build/java_apk.gypi' ],
         },
@@ -1384,7 +1384,7 @@
             'resource_dir': 'shell/android/linker_test_apk/res',
             'native_lib_target': 'libcontent_android_linker_test',
             'additional_input_paths': ['<(PRODUCT_DIR)/content_shell/assets/content_shell.pak'],
-            'asset_location': '<(ant_build_out)/content_shell/assets',
+            'asset_location': '<(PRODUCT_DIR)/content_shell/assets',
             'use_content_linker': '1',
             'enable_content_linker_tests': '1',
           },