Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cleanup: remove trailing spaces from framework build files #998

Merged
merged 2 commits into from
Jun 10, 2020
Merged

cleanup: remove trailing spaces from framework build files #998

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4227a35
remove trailing spaces from framework/build.xml
Jun 10, 2020
24066cd
remove trailing spaces from framework/cordova.gradle
Jun 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions framework/build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@
<fail message="The required minimum version of ant is 1.8.0, you have ${ant.version}"
unless="thisantversion" />

<!-- The local.properties file is created and updated by the 'android'
<!-- The local.properties file is created and updated by the 'android'
tool. (For example "sdkdir/tools/android update project -p ." inside
of this directory where the AndroidManifest.xml file exists. This
properties file that gets built contains the path to the SDK. It
properties file that gets built contains the path to the SDK. It
should *NOT* be checked into Version Control Systems since it holds
data about the local machine. -->
<available file="local.properties" property="exists.local.properties" />
Expand Down Expand Up @@ -132,11 +132,11 @@
excludes="org/apache/cordova/R.class,org/apache/cordova/R$*.class"
jarfile="cordova-${version}.jar" />
</target>

<target name="javadoc">
<delete dir="javadoc-public" failonerror="false" />
<javadoc
access="public"
access="public"
destdir="javadoc-public"
classpath="${sdk.dir}/platforms/${target}/android.jar">
<packageset dir="src">
Expand All @@ -145,7 +145,7 @@
</javadoc>
<delete dir="javadoc-private" failonerror="false" />
<javadoc
access="private"
access="private"
destdir="javadoc-private"
classpath="${sdk.dir}/platforms/${target}/android.jar">
<packageset dir="src">
Expand Down
2 changes: 1 addition & 1 deletion framework/cordova.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ String getAndroidSdkDir() {
if (envVar == null) {
envVar = System.getenv("ANDROID_HOME")
}

def localProperties = new File(rootDir, 'local.properties')
String systemProperty = System.getProperty("android.home")
if (envVar != null) {
Expand Down