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

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

Issue 2699663004: Do not enforce unique package name in gradle projects. (Closed)
Patch Set: Created 3 years, 10 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 | no next file » | 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 22 matching lines...) Expand all
33 {% if template_type in ('android_library', 'android_junit') %} 33 {% if template_type in ('android_library', 'android_junit') %}
34 apply plugin: "com.android.library" 34 apply plugin: "com.android.library"
35 {% elif template_type == 'android_apk' %} 35 {% elif template_type == 'android_apk' %}
36 apply plugin: "com.android.application" 36 apply plugin: "com.android.application"
37 {% endif %} 37 {% endif %}
38 38
39 android { 39 android {
40 compileSdkVersion {{ compile_sdk_version }} 40 compileSdkVersion {{ compile_sdk_version }}
41 buildToolsVersion "{{ build_tools_version }}" 41 buildToolsVersion "{{ build_tools_version }}"
42 publishNonDefault true 42 publishNonDefault true
43 // Multiple targets use the package name "dummy.package"
44 enforceUniquePackageName false
43 45
44 compileOptions { 46 compileOptions {
45 sourceCompatibility JavaVersion.VERSION_1_7 47 sourceCompatibility JavaVersion.VERSION_1_7
46 targetCompatibility JavaVersion.VERSION_1_7 48 targetCompatibility JavaVersion.VERSION_1_7
47 } 49 }
48 50
49 sourceSets { 51 sourceSets {
50 {% for name in ['main', 'test', 'androidTest', 'debug', 'release'] %} 52 {% for name in ['main', 'test', 'androidTest', 'debug', 'release'] %}
51 {{ name }} { 53 {{ name }} {
52 aidl.srcDirs = [] 54 aidl.srcDirs = []
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 || it.name.endsWith('ResValues') 86 || it.name.endsWith('ResValues')
85 {% endif %} 87 {% endif %}
86 || it.name.endsWith('Aidl') 88 || it.name.endsWith('Aidl')
87 || it.name.endsWith('Renderscript') 89 || it.name.endsWith('Renderscript')
88 || it.name.endsWith('Shaders')) 90 || it.name.endsWith('Shaders'))
89 } 91 }
90 tasksToDisable.each { Task task -> 92 tasksToDisable.each { Task task ->
91 task.enabled = false 93 task.enabled = false
92 } 94 }
93 } 95 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698