Chromium Code Reviews Chromium Code Reviews
Issue 11308030:
Use _target_name instead of package_name for java*.gypi (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@apk_jar| OLD | NEW |
|---|---|
| 1 <!-- | 1 <!-- |
| 2 Copyright (c) 2012 The Chromium Authors. All rights reserved. | 2 Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 3 Use of this source code is governed by a BSD-style license that can be | 3 Use of this source code is governed by a BSD-style license that can be |
| 4 found in the LICENSE file. | 4 found in the LICENSE file. |
| 5 --> | 5 --> |
| 6 <project default="error"> | 6 <project default="error"> |
| 7 <property name="ant.project.name" value="${APK_NAME}"/> | 7 <property name="ant.project.name" value="${APK_NAME}"/> |
| 8 <!-- | 8 <!-- |
| 9 Gyp will pass CONFIGURATION_NAME as the target for ant to build. These targe ts will call the | 9 Gyp will pass CONFIGURATION_NAME as the target for ant to build. These targe ts will call the |
| 10 appropriate sdk tools target. | 10 appropriate sdk tools target. |
| 11 --> | 11 --> |
| 12 <target name="Debug" depends="debug"/> | 12 <target name="Debug" depends="debug"/> |
| 13 <target name="Release" depends="release"/> | 13 <target name="Release" depends="release"/> |
| 14 <target name="error"> | 14 <target name="error"> |
| 15 <fail message="CONFIGURATION_NAME should be passed as a target to ant."/> | 15 <fail message="CONFIGURATION_NAME should be passed as a target to ant."/> |
| 16 </target> | 16 </target> |
| 17 | 17 |
| 18 <description> | 18 <description> |
| 19 Building ${ant.project.name}.apk | 19 Building ${ant.project.name}.apk |
| 20 </description> | 20 </description> |
| 21 <import file="common.xml"/> | 21 <import file="common.xml"/> |
| 22 | 22 |
| 23 <property-location | 23 <property-location |
|
Yaron
2012/11/08 02:43:11
Nit: can probably collapse into a single line, rig
cjhopman
2012/12/05 00:51:04
Done.
| |
| 24 name="out.dir" | 24 name="out.dir" |
| 25 location="${PRODUCT_DIR}/${PACKAGE_NAME}" | 25 location="${OUT_DIR}" |
| 26 check-exists="false" | 26 check-exists="false" |
| 27 /> | 27 /> |
| 28 | 28 |
| 29 <path id="javac.srcdirs.additional"> | 29 <path id="javac.srcdirs.additional"> |
| 30 <filelist files="${ADDITIONAL_SRC_DIRS}"/> | 30 <filelist files="${ADDITIONAL_SRC_DIRS}"/> |
| 31 <filelist files="${GENERATED_SRC_DIRS}"/> | 31 <filelist files="${GENERATED_SRC_DIRS}"/> |
| 32 </path> | 32 </path> |
| 33 | 33 |
| 34 <property-value name="target.abi" value="${APP_ABI}"/> | 34 <property-value name="target.abi" value="${APP_ABI}"/> |
| 35 <property name="resource.absolute.dir" value="${RESOURCE_DIR}"/> | 35 <property name="resource.absolute.dir" value="${RESOURCE_DIR}"/> |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 67 </path> | 67 </path> |
| 68 | 68 |
| 69 <path id="out.dex.jar.input.ref"> | 69 <path id="out.dex.jar.input.ref"> |
| 70 <path refid="javac.custom.classpath"/> | 70 <path refid="javac.custom.classpath"/> |
| 71 </path> | 71 </path> |
| 72 | 72 |
| 73 <import file="sdk-targets.xml"/> | 73 <import file="sdk-targets.xml"/> |
| 74 <import file="${sdk.dir}/tools/ant/build.xml"/> | 74 <import file="${sdk.dir}/tools/ant/build.xml"/> |
| 75 </project> | 75 </project> |
| 76 | 76 |
| OLD | NEW |
