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

Issue 321453002: Add creation of v14 compatible resources to process_resources.py (Closed)

Created:
6 years, 6 months ago by cjhopman
Modified:
6 years, 6 months ago
Reviewers:
newt (away)
CC:
chromium-reviews, klundberg+watch_chromium.org, bulach+watch_chromium.org, yfriedman+watch_chromium.org, ilevy-cc_chromium.org
Visibility:
Public.

Description

Add creation of v14 compatible resources to process_resources.py There are a lot of steps in processing resources and preparing them for packaging. It will be easier if these are all done by the same script. BUG=375431, 359249 Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=275401

Patch Set 1 #

Total comments: 4

Patch Set 2 : All the fixes #

Unified diffs Side-by-side diffs Delta from patch set Stats (+56 lines, -53 lines) Patch
M build/android/gyp/generate_v14_compatible_resources.py View 4 chunks +16 lines, -14 lines 0 comments Download
M build/android/gyp/process_resources.py View 1 6 chunks +25 lines, -2 lines 0 comments Download
M build/grit_action.gypi View 1 chunk +1 line, -1 line 0 comments Download
M build/java.gypi View 5 chunks +12 lines, -36 lines 0 comments Download
M build/java_apk.gypi View 2 chunks +2 lines, -0 lines 0 comments Download

Messages

Total messages: 7 (0 generated)
cjhopman
6 years, 6 months ago (2014-06-06 01:30:04 UTC) #1
newt (away)
lgtm after nit and a fix https://codereview.chromium.org/321453002/diff/1/build/android/gyp/process_resources.py File build/android/gyp/process_resources.py (right): https://codereview.chromium.org/321453002/diff/1/build/android/gyp/process_resources.py#newcode19 build/android/gyp/process_resources.py:19: import generate_v14_compatible_resources as ...
6 years, 6 months ago (2014-06-06 01:37:36 UTC) #2
cjhopman
https://codereview.chromium.org/321453002/diff/1/build/android/gyp/process_resources.py File build/android/gyp/process_resources.py (right): https://codereview.chromium.org/321453002/diff/1/build/android/gyp/process_resources.py#newcode19 build/android/gyp/process_resources.py:19: import generate_v14_compatible_resources as v14_resources On 2014/06/06 01:37:35, newt wrote: ...
6 years, 6 months ago (2014-06-06 01:46:55 UTC) #3
cjhopman
The CQ bit was checked by cjhopman@chromium.org
6 years, 6 months ago (2014-06-06 01:46:58 UTC) #4
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/cjhopman@chromium.org/321453002/20001
6 years, 6 months ago (2014-06-06 01:49:25 UTC) #5
commit-bot: I haz the power
Change committed as 275401
6 years, 6 months ago (2014-06-06 11:16:05 UTC) #6
johnme
6 years, 6 months ago (2014-06-06 14:21:43 UTC) #7
Message was sent while issue was closed.
A revert of this CL has been created in
https://codereview.chromium.org/314363002/ by johnme@chromium.org.

The reason for reverting is: This is causing instrumentation-yakju-clankium-tot
and clang-clankium-tot-builder (downstream) to fail with the following error
message:

FAILED: cd ../../clank/native/framework; python
../../../build/android/gyp/process_resources.py --android-sdk
/b/build/slave/instrumentation-yakju-clankium-tot/build/src/third_party/android_tools/sdk//platforms/android-19
--android-sdk-tools
/b/build/slave/instrumentation-yakju-clankium-tot/build/src/third_party/android_tools/sdk//build-tools/19.0.0
--android-manifest ../../../clank/java/apps/deviceextras/AndroidManifest.xml
--dependencies-res-dirs "" --extra-res-packages "" --extra-r-text-files ""
--proguard-file ../../../out/Debug/device_extras_apk/proguard.txt --resource-dir
../../../clank/java/apps/deviceextras/res --res-v14-compatibility-dir
../../../out/Debug/device_extras_apk/res_v14_compatibility --crunch-output-dir
../../../out/Debug/device_extras_apk/res --R-dir
../../../out/Debug/device_extras_apk/gen --stamp
../../../out/Debug/device_extras_apk/codegen.stamp
Traceback (most recent call last):
  File "../../../build/android/gyp/process_resources.py", line 217, in <module>
    main()
  File "../../../build/android/gyp/process_resources.py", line 166, in main
    options.v14_verify_only)
  File
"/b/build/slave/instrumentation-yakju-clankium-tot/build/src/build/android/gyp/generate_v14_compatible_resources.py",
line 335, in GenerateV14Resources
    ErrorIfStyleResourceExistsInDir(input_dir)
  File
"/b/build/slave/instrumentation-yakju-clankium-tot/build/src/build/android/gyp/generate_v14_compatible_resources.py",
line 107, in ErrorIfStyleResourceExistsInDir
    '-v17 directory. Please refer to '
Exception: error: style file
/b/build/slave/instrumentation-yakju-clankium-tot/build/src/clank/java/apps/deviceextras/res/values/styles.xml
should be under
/b/build/slave/instrumentation-yakju-clankium-tot/build/src/clank/java/apps/deviceextras/res/values-v17
directory. Please refer to http://crbug.com/243952 for the details.

I don't know resource loading well enough to tell if that's a legitimate issue
or not; so for now reverting this to fix the build bots, and if it is a
legitimate issue then ideally it could be fixed before relanding this?.

Powered by Google App Engine
This is Rietveld 408576698