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

Unified Diff: chromeos-base/chromeos-chrome/chromeos-chrome-9999.ebuild

Issue 9923012: Enable NaCl build on ARM. (Closed) Base URL: http://git.chromium.org/git/chromiumos/overlays/chromiumos-overlay@master
Patch Set: Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromeos-base/chromeos-chrome/chromeos-chrome-9999.ebuild
diff --git a/chromeos-base/chromeos-chrome/chromeos-chrome-9999.ebuild b/chromeos-base/chromeos-chrome/chromeos-chrome-9999.ebuild
index b4a0af28540ec984f04d669df03b1275eb04a4c7..abd0d5f9dfe0226fdc7b6cecc2fb6eeb1c656114 100644
--- a/chromeos-base/chromeos-chrome/chromeos-chrome-9999.ebuild
+++ b/chromeos-base/chromeos-chrome/chromeos-chrome-9999.ebuild
@@ -198,7 +198,7 @@ QA_EXECSTACK="*"
QA_PRESTRIPPED="*"
use_nacl() {
- (use amd64 || use x86) && ! use asan && ! use component_build && ! use drm
+ (use amd64 || use x86 || use arm) && ! use asan && ! use component_build && ! use drm
}
set_build_defines() {
@@ -711,6 +711,10 @@ src_compile() {
echo Building test targets: ${TEST_TARGETS}
fi
+ if use_nacl; then
+ NACL_TARGETS="nacl_helper_bootstrap nacl_helper"
+ fi
+
if use drm; then
time emake -r $(use verbose && echo V=1) \
BUILDTYPE="${BUILDTYPE}" \
@@ -721,6 +725,7 @@ src_compile() {
time emake -r $(use verbose && echo V=1) \
BUILDTYPE="${BUILDTYPE}" \
chrome chrome_sandbox libosmesa.so default_extensions \
+ ${NACL_TARGETS} \
${TEST_TARGETS} \
|| die "compilation failed"
fi
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698