Move version branding to before relocation packing.
commit4749549c06525071692f777fc6a1fa5a9ad7f877
authorsimonb <simonb@chromium.org>
Mon, 6 Oct 2014 14:36:01 +0000 (6 07:36 -0700)
committerCommit bot <commit-bot@chromium.org>
Mon, 6 Oct 2014 14:36:16 +0000 (6 14:36 +0000)
treeb7f85a8b65dc33d69f48ded25354b07896b999f7
parenta5d32a2fac874ad135c75361dff17fa00813c76e
Move version branding to before relocation packing.

Objcopy knows nothing about the dynamic tags that point to packed
relocation data.  If objcopy is run after relocation packing, and if it
moves the .android.rel.dyn section, these dynamic tags become invalid
and the crazy linker cannot load the library:

E/chromium_android_linker( 9584): Open:
    Could not open libchrome.2180.0.so:
    Bad packed relocations ident, expected APR1 or APA1

Currently, version branding happens at the end of building libchrome.so,
and after relocation packing.  Re-order so that relocation packing again
comes after all other strip and/or objcopy operations.

BUG=417510

Review URL: https://codereview.chromium.org/621263003

Cr-Commit-Position: refs/heads/master@{#298236}
build/android/gyp/insert_chromium_version.py
build/android/insert_chromium_version.gypi
build/java_apk.gypi