Skip to content

Commit

Permalink
Change Browser Actions resources package name to android.support.cust…
Browse files Browse the repository at this point in the history
…omtabs

Now Browser Actions fails when importing to Android studio because all
its classes using resources does not import R file. However, importing
android.support.customtabs.R fails on ninja compile because BUILD.gn sets
the resource package name to android.support.customtabs.browseraction.
This CL changes the package name to android.support.customtabs to allow
importing android.support.customtabs.R and roll out custom-tab-client
change: third-party/custom-tab-client/54788baf5bfbe5bb42977dc52c2f608392e60f72.

Bug: None
Change-Id: I9f58305c2610f049fb750f152e0e22961d2b7482
Reviewed-on: https://chromium-review.googlesource.com/939853
Commit-Queue: Lei Tian <ltian@chromium.org>
Reviewed-by: Bernhard Bauer <bauerb@chromium.org>
Cr-Commit-Position: refs/heads/master@{#541253}
  • Loading branch information
LuciferTian2010 authored and Commit Bot committed Mar 7, 2018
1 parent 0b453a6 commit c519eef
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,7 @@ deps = {
},

'src/third_party/custom_tabs_client/src': {
'url': Var('chromium_git') + '/custom-tabs-client.git' + '@' + '7884a658507dc99bcb54b328bc29d76e64c3b684',
'url': Var('chromium_git') + '/custom-tabs-client.git' + '@' + '54788baf5bfbe5bb42977dc52c2f608392e60f72',
'condition': 'checkout_android',
},

Expand Down
2 changes: 1 addition & 1 deletion third_party/custom_tabs_client/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ android_resources("chrome_tabs_client_example_apk_resources") {
android_resources("custom_tabs_support_resources") {
resource_dirs = [ "src/customtabs/res" ]
android_manifest = "src/customtabs/AndroidManifest.xml"
custom_package = "android.support.customtabs.browseractions"
custom_package = "android.support.customtabs"
}

android_apk("custom_tabs_client_example_apk") {
Expand Down

0 comments on commit c519eef

Please sign in to comment.