Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(251)

Side by Side Diff: build/android/gradle/android.jinja

Issue 2722973002: Revert of Make generate_gradle.py work with preview SDKs. (Closed)
Patch Set: Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | build/android/gradle/generate_gradle.py » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 {# Copyright 2016 The Chromium Authors. All rights reserved. #} 1 {# Copyright 2016 The Chromium Authors. All rights reserved. #}
2 {# Use of this source code is governed by a BSD-style license that can be #} 2 {# Use of this source code is governed by a BSD-style license that can be #}
3 {# found in the LICENSE file. #} 3 {# found in the LICENSE file. #}
4 {% macro expand_sourceset(variables, prefix) %} 4 {% macro expand_sourceset(variables, prefix) %}
5 {% if variables is defined %} 5 {% if variables is defined %}
6 {{ prefix }} { 6 {{ prefix }} {
7 manifest.srcFile "{{ variables.android_manifest }}" 7 manifest.srcFile "{{ variables.android_manifest }}"
8 java.srcDirs = [ 8 java.srcDirs = [
9 {% for path in variables.java_dirs %} 9 {% for path in variables.java_dirs %}
10 "{{ path }}", 10 "{{ path }}",
(...skipping 21 matching lines...) Expand all
32 {% endmacro %} 32 {% endmacro %}
33 // Generated by //build/android/generate_gradle.py 33 // Generated by //build/android/generate_gradle.py
34 34
35 {% if template_type in ('android_library', 'android_junit') %} 35 {% if template_type in ('android_library', 'android_junit') %}
36 apply plugin: "com.android.library" 36 apply plugin: "com.android.library"
37 {% elif template_type == 'android_apk' %} 37 {% elif template_type == 'android_apk' %}
38 apply plugin: "com.android.application" 38 apply plugin: "com.android.application"
39 {% endif %} 39 {% endif %}
40 40
41 android { 41 android {
42 compileSdkVersion "{{ compile_sdk_version }}" 42 compileSdkVersion {{ compile_sdk_version }}
43 buildToolsVersion "{{ build_tools_version }}" 43 buildToolsVersion "{{ build_tools_version }}"
44 publishNonDefault true 44 publishNonDefault true
45 // Multiple targets use the package name "dummy.package" 45 // Multiple targets use the package name "dummy.package"
46 enforceUniquePackageName false 46 enforceUniquePackageName false
47 47
48 compileOptions { 48 compileOptions {
49 sourceCompatibility JavaVersion.VERSION_1_7 49 sourceCompatibility JavaVersion.VERSION_1_7
50 targetCompatibility JavaVersion.VERSION_1_7 50 targetCompatibility JavaVersion.VERSION_1_7
51 } 51 }
52 52
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 } 93 }
94 tasksToDisable.each { Task task -> 94 tasksToDisable.each { Task task ->
95 task.enabled = false 95 task.enabled = false
96 } 96 }
97 {% if bootclasspath is defined %} 97 {% if bootclasspath is defined %}
98 tasks.withType(JavaCompile) { 98 tasks.withType(JavaCompile) {
99 options.bootClasspath = "{{ bootclasspath }}" 99 options.bootClasspath = "{{ bootclasspath }}"
100 } 100 }
101 {% endif %} 101 {% endif %}
102 } 102 }
OLDNEW
« no previous file with comments | « no previous file | build/android/gradle/generate_gradle.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698