mm and mmm were not parsing out/soong/Android.mk, so they were ignoring
all modules defined in an Android.bp file. Always include
out/soong/Android.mk when ONE_SHOT_MAKEFILE is set, and convert the mm
and mmm functions to build MODULES-IN-$DIR instead of all_modules so
that only the subset of modules defined in out/soong/Android.mk for the
requested directory are built.
Bug: 28986194
Change-Id: I6e1ff8cacfc668a4154a0d5937450db840bb7a6b
These have all been strictly checked by Soong, so the values currently
match. Just remove them so that the make variables exported by Soong
will take over.
This also removes some of the GCC reconfiguration, since we haven't
implemented that in Soong. If it becomes useful in the future, we'll
implement it there.
Some things like TARGET_TOOCHAIN_ROOT can nearly be removed, but are
used before the Soong-exported make_vars.mk is loaded. In that case,
added to the clang cflags, so it can be removed once the cflags are
removed.
Others, like LLVM_PREBUILTS_VERSION are loaded even earlier -- in
envsetup.sh before we've even configured Soong. So for now, keep the
Make definition, and continue ensuring it's the same as the Soong
version.
Change-Id: I554b27062ac43610828a8c06d640d919a2dc21ca
WEBCORE_INSTRUMENTATION is never set in practice, nor ever read, so seems
totally spurious.
ENABLE_SVG is the default since 3.0 and disabling will no longer be a
supported option in chromium webview.
Change-Id: I651fa55fd7c20b2f251bae584407548be174a8aa
Merge commit '1884d99a7ab74dd53d9134d6200bb0aff3867f8c'
* commit '1884d99a7ab74dd53d9134d6200bb0aff3867f8c':
The java version changed, and we made envsetup automatically find the right JAVA_HOME.
To enable SVG, edit your buildspec.mk to
ENABLE_SVG:=true
then
make clean-libwebcore && make
Some SVG functionality has been stubbed out in this checkin.
//branches/master/android/build/buildspec.mk.default # edit
- add ENABLE_SVG, commented out by default
- fix up WEBCORE_INSTRUMENTATION define while I was in there
//branches/master/android/external/webkit/Android.mk # edit
- add ENABLE_SVG C define
- add svg paths to C includes
//branches/master/android/external/webkit/WebCore/Android.derived.mk # edit
- update merge tool rules
- add svg to css property names, keywords, generated bindings
- add svg names, element factory, wrappers
- remove obsolete ksvgcssproperties.h
- add XLinkNames, required by SVG
//branches/master/android/external/webkit/WebCore/Android.mk # edit
- update merge tool rules
- add svg bindings, css svg parsing, svg rendering, svg engine
//branches/master/android/external/webkit/WebCore/config.h # edit
- leave ENABLE_SVG alone if it is already defined
//branches/master/android/external/webkit/WebCore/loader/EmptyClients.h # edit
- add some Android extensions as empty virtuals (EmptyClients is only used by SVG)
//branches/master/android/external/webkit/WebCore/platform/graphics/android/GraphicsContextAndroid.cpp # edit
//branches/master/android/external/webkit/WebCore/platform/graphics/android/PathAndroid.cpp # edit
- add SVG graphics porting functions. Note the FIXMEs -- some are unimplemented.
BUG=1474412
Automated import of CL 145053
