LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am e95a86cf: Merge change 22346 into donut

Browse Source 
Merge commit 'e95a86cfec18836ddbff149690a13766bfc9ada3' into eclair

* commit 'e95a86cfec18836ddbff149690a13766bfc9ada3':
  Fix target for ApiDemos (API is now 4)
This commit is contained in:
Xavier Ducrohet
2009-08-22 07:44:12 -07:00
committed by Android Git Automerger
parent 8535518cb2 e95a86cfec
commit 53b3190a47
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
samples/ApiDemos/default.properties
View File

@@ -8,4 +8,4 @@
# project structure. # project structure.
# Project target. # Project target.
target=android-3 target=android-4

3
tools/scripts/android_rules.xml
View File

@@ -180,6 +180,7 @@
</target> </target>
<target name="debug" depends="dex, package-resources, debug-sign, package"> <target name="debug" depends="dex, package-resources, debug-sign, package">
<echo>Running zip align on final apk...</echo>
<exec executable="${zipalign}" failonerror="true"> <exec executable="${zipalign}" failonerror="true">
<arg value="-f" /> <arg value="-f" />
<arg value="4" /> <arg value="4" />
@@ -215,6 +216,7 @@
message="Please enter password for alias '${key.alias}':" message="Please enter password for alias '${key.alias}':"
addproperty="key.alias.password"/> addproperty="key.alias.password"/>
<!-- sign the APK --> <!-- sign the APK -->
<echo>Signing final apk...</echo>
<signjar <signjar
jar="${out-unsigned-package}" jar="${out-unsigned-package}"
signedjar="${out-unaligned-package}" signedjar="${out-unaligned-package}"
@@ -223,6 +225,7 @@
alias="${key.alias}" alias="${key.alias}"
keypass="${key.alias.password}"/> keypass="${key.alias.password}"/>
<!-- zip align the APK --> <!-- zip align the APK -->
<echo>Running zip align on final apk...</echo>
<exec executable="${zipalign}" failonerror="true"> <exec executable="${zipalign}" failonerror="true">
<arg value="-f" /> <arg value="-f" />
<arg value="4" /> <arg value="4" />