Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove unneccessary resource compilation from android #5951

Merged
merged 1 commit into from
Jul 1, 2020

Conversation

petemill
Copy link
Member

@petemill petemill commented Jun 25, 2020

  • Settings
  • NTP
  • Welcome

Fix brave/brave-browser#10479

Copy link
Contributor

@samartnik samartnik left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@petemill
Copy link
Member Author

error in android build

16:16:08  FAILED: libmonochrome__combined.so libmonochrome__combined.so.TOC lib.unstripped/libmonochrome__combined.so lib.unstripped/libmonochrome__combined.so.map.gz 
16:16:08  python "../../build/toolchain/gcc_solink_wrapper.py" --readelf="../../third_party/android_ndk/toolchains/llvm/prebuilt/linux-x86_64/bin/i686-linux-android-readelf" --nm="../../third_party/android_ndk/toolchains/llvm/prebuilt/linux-x86_64/bin/i686-linux-android-nm" --strip=../../buildtools/third_party/eu-strip/bin/eu-strip --sofile="./lib.unstripped/libmonochrome__combined.so" --tocfile="./libmonochrome__combined.so.TOC" --map-file "./lib.unstripped/libmonochrome__combined.so.map.gz" --output="./libmonochrome__combined.so" -- ../../third_party/llvm-build/Release+Asserts/bin/clang++ -shared -Wl,-soname="libmonochrome__combined.so" -Wl,--version-script=gen/chrome/android/libmonochrome_linker_script.txt -Wl,--hash-style=gnu -Wl,-soname,libmonochrome.so --link-only -Wl,--fatal-warnings -Wl,--build-id=sha1 -fPIC -Wl,-z,noexecstack -Wl,-z,relro -Wl,-z,now -Wl,-z,defs -Wl,--as-needed -fuse-ld=lld -Wl,--icf=all -Wl,--color-diagnostics -flto=thin -Wl,--thinlto-jobs=8 -Wl,--thinlto-cache-dir=thinlto-cache -Wl,--thinlto-cache-policy,cache_size=10\%:cache_size_bytes=10g:cache_size_files=100000 -Wl,--lto-O2 -Wl,-mllvm -Wl,-import-instr-limit=5 -Wl,--no-rosegment -Wl,--exclude-libs=libgcc.a -Wl,--exclude-libs=libvpx_assembly_arm.a -Wl,--allow-multiple-definition --target=i686-linux-android16 -m32 -Werror -Wl,--warn-shared-textrel -Wl,-O2 -Wl,--gc-sections -nostdlib++ --sysroot=../../third_party/android_ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot -B../../third_party/android_ndk/toolchains/llvm/prebuilt/linux-x86_64 -Wl,--warn-shared-textrel -Wl,--pack-dyn-relocs=android -Wl,-wrap,calloc -Wl,-wrap,free -Wl,-wrap,malloc -Wl,-wrap,memalign -Wl,-wrap,posix_memalign -Wl,-wrap,pvalloc -Wl,-wrap,realloc -Wl,-wrap,valloc -Wl,--dynamic-linker,/system/bin/linker -o "./lib.unstripped/libmonochrome__combined.so" @"./libmonochrome__combined.so.rsp"
16:16:08  ld.lld: error: undefined symbol: BraveNewTabUI::BraveNewTabUI(content::WebUI*, std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> > const&)
16:16:08  >>> referenced by brave_web_ui_controller_factory.cc:84 (../../brave/browser/ui/webui/brave_web_ui_controller_factory.cc:84)
16:16:08  >>>               thinlto-cache/Thin-a2539a.tmp.o:(content::WebUIController* (anonymous namespace)::NewWebUI<BasicUI>(content::WebUI*, GURL const&))
16:16:08  clang: error: linker command failed with exit code 1 (use -v to see invocation)
16:16:08  ninja: build stopped: subcommand failed.

@petemill petemill force-pushed the android-no-compile-settings branch from c953ad8 to cd9848f Compare June 30, 2020 23:14
@petemill
Copy link
Member Author

Pushed a fix, waiting for build

@petemill
Copy link
Member Author

petemill commented Jul 1, 2020

android passed everything, just macOS test failure 🤷

@petemill petemill force-pushed the android-no-compile-settings branch from cd9848f to 574fe4d Compare July 1, 2020 18:54
@petemill
Copy link
Member Author

petemill commented Jul 1, 2020

Rebased on master, looks like master fixes those tests

@petemill
Copy link
Member Author

petemill commented Jul 1, 2020

uncritical CI failure (unstable status), 1 linux test error:

1 test failed:
12:51:46      RewardsBrowserTest.NotVerifiedWallet (../../brave/components/brave_rewards/browser/test/rewards_browsertest.cc:236)

All ✔️ on android.

@petemill petemill merged commit 62a17d7 into master Jul 1, 2020
@petemill petemill deleted the android-no-compile-settings branch July 1, 2020 22:10
mkarolin pushed a commit that referenced this pull request Jul 7, 2020
Remove unneccessary resource compilation from android
@bsclifton bsclifton added this to the 1.11.x - Release milestone Aug 7, 2020
@bsclifton
Copy link
Member

Uplifted to 1.11.x with #5996

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Android is compiling unneccessary resources
3 participants