forked from chromium/chromium
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
GN: Some small changes to support chrome android internal stuff
This actually hooks up (i.e. passes from invoker) several variables controlling apk creation (version name, version code, use_relocation_packer, use_chromium_linker, unzip_libraries_from_apk). Adds support for overriding some configuration in the private repo. Adds support for public_configs in grit_rule.gni. Adds some junit targets (these are built as android libraries currently instead of host libraries, but that just means we do a bit extra work that we don't really need). BUG=359249 Review URL: https://codereview.chromium.org/659703002 Cr-Commit-Position: refs/heads/master@{#301039}
- Loading branch information
cjhopman
authored and
Commit bot
committed
Oct 24, 2014
1 parent
7ec86e8
commit ca675d3
Showing
13 changed files
with
203 additions
and
88 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
# Copyright 2014 The Chromium Authors. All rights reserved. | ||
# Use of this source code is governed by a BSD-style license that can be | ||
# found in the LICENSE file. | ||
|
||
assert(is_android) | ||
|
||
import("//build/config/android/rules.gni") | ||
|
||
# TODO(GYP): should be java_library | ||
# GYP: //testing/android/junit_test.gyp:junit_test_support | ||
android_library("junit_test_support") { | ||
DEPRECATED_java_in_dir = "java/src" | ||
deps = [ | ||
"//third_party/junit" | ||
] | ||
} | ||
|
||
# TODO(GYP): should be java_library | ||
# GYP: //testing/android/junit_test.gyp:junit_unit_tests | ||
android_library("junit_unittests") { | ||
deps = [ | ||
":junit_test_support", | ||
"//third_party/junit", | ||
] | ||
#main_class = "org.chromium.testing.local.JuniTestMain" | ||
DEPRECATED_java_in_dir = "javatests/src" | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
# Copyright 2014 The Chromium Authors. All rights reserved. | ||
# Use of this source code is governed by a BSD-style license that can be | ||
# found in the LICENSE file. | ||
|
||
import("//build/config/android/rules.gni") | ||
|
||
# TODO(GYP): should be java_prebuilt | ||
# GYP: //third_party/junit.gyp:hamcrest_jar | ||
android_java_prebuilt("hamcrest") { | ||
jar_path = "src/lib/hamcrest-core-1.3.jar" | ||
} | ||
|
||
# TODO(GYP): should be java_library | ||
# GYP: //third_party/junit.gyp:junit_jar | ||
android_library("junit") { | ||
deps = [ | ||
":hamcrest" | ||
] | ||
DEPRECATED_java_in_dir = "src/src/main/java" | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.