Commit Graph

23 Commits

Author SHA1 Message Date
Colin Cross
8873713f36 Add TARGET_PLATFORM_VERSION to lunch
lunch can now take combos in the form:
$TARGET_PRODUCT
$TARGET_PRODUCT-$TARGET_BUILD_VARIANT
$TARGET_PRODUCT-$TARGET_BUILD_VARIANT-$TARGET_PLATFORM_VERSION

If all 3 are not specified the unspecified ones will take the
default values provided by the build system (eng, and currently
OPR1).

In addition, error handling for invalid products, variants and
versions is moved to the build system.

Bug: 34972208
Test: build/make/tests/envsetup_tests.sh
Change-Id: Ib0aaa98633448ba9bd8df911704c9cb3a8ebbe85
2017-03-23 09:44:08 -07:00
Dan Willemsen
53e3899222 Fix GET-INSTALL-PATH to work with Soong
This was printing all of the Soong modules in addition to the modules
defined in the ONE_SHOT_MAKEFILE. So replicate what we did with
MODULES-IN-* with GET-INSTALL-PATH-IN-* and update all the users.

Bug: 30191725
Change-Id: Ib1e4bf00f64d7a3e8cd91f44eaf1ff82fdfbf162
2016-08-12 05:10:51 +00:00
Colin Cross
8642525726 Fix mm and mmm in Android.bp directories
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
2016-05-26 15:56:21 -07:00
Dan Willemsen
4863dafcb1 Remove make variables exported from Soong
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
2016-05-16 20:39:58 -07:00
Jonathan Dixon
d588792d29 Remove WEBCORE_INSTRUMENTATION and ENABLE_SVG
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
2013-07-25 15:52:17 -07:00
Brian Carlstrom
1aeee8bb66 Move from WITH_ART to PRODUCT_RUNTIMES
Change-Id: I3a9217b4aafc1f59d095169deb9eaeae17320505
2013-06-27 16:49:15 -07:00
Brian Carlstrom
6901768e36 Add WITH_ART
(cherry picked from commit 6b7a0d2f1ff90d24e3ade9ccf82a084f5f999c1f)

Change-Id: If6e208f9fc859f31da2cd71fdc1ddbe1fc1ed7aa
2013-05-22 10:49:57 -07:00
Jeff Brown
e33ba4c49e Remove the simulator target from all makefiles.
Bug: 5010576

Change-Id: Ie814f4c8d3aa1e7cc7f5735822ab25542f36cf62
2011-07-11 23:51:37 -07:00
Joe Onorato
74ba0c834f am 1884d99a: am aee4daac: The java version changed, and we made envsetup automatically find the right JAVA_HOME.
Merge commit '1884d99a7ab74dd53d9134d6200bb0aff3867f8c'

* commit '1884d99a7ab74dd53d9134d6200bb0aff3867f8c':
  The java version changed, and we made envsetup automatically find the right JAVA_HOME.
2010-06-23 16:04:38 -07:00
Joe Onorato
aee4daacc8 The java version changed, and we made envsetup automatically find the right JAVA_HOME.
This change forces everyone to re-source envsetup.sh

Change-Id: Ieb9512d5725cca26a83debf9b0480bc20e19d5ee
2010-06-23 14:03:13 -07:00
Shimeng (Simon) Wang
af168fe267 Change buildspec to allow disabling SVG.
Change-Id: Ia1a8fab6118f39ca10ca8df2254bef5466e54d75
2010-05-04 10:22:40 -07:00
Jean-Baptiste Queru
e1b710a5ba merge from open-source master 2009-11-09 10:34:27 -08:00
Joe Onorato
582b21e87e BUILD SYSTEM ONLY - Add TARGET_BUILD_VARIANT to buildspec.mk.default,
and put the commonly used options at the top.
2009-10-05 10:06:54 -07:00
Keith Deacon
7d3d4a5af1 Added a default to specify an alternative tool chain prefix if needed. 2009-08-26 10:44:27 -07:00
Cary Clark
2a66f06927 AI 145053: add SVG to the browser [disabled by default]
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
2009-04-08 08:09:31 -07:00
The Android Open Source Project
88b607994a auto import from //depot/cupcake/@135843 2009-03-03 19:28:42 -08:00
The Android Open Source Project
05806d7af6 auto import from //depot/cupcake/@135843 2009-03-03 18:28:14 -08:00
The Android Open Source Project
094268cf8c auto import from //depot/cupcake/@132589 2009-03-03 14:03:52 -08:00
The Android Open Source Project
a9b2249753 auto import from //depot/cupcake/@137055 2009-03-02 22:54:15 -08:00
The Android Open Source Project
4d23ccc023 auto import from //branches/cupcake/...@132569 2009-02-20 07:38:28 -08:00
The Android Open Source Project
66339ad5ce auto import from //branches/cupcake/...@126645 2009-01-15 16:12:07 -08:00
The Android Open Source Project
dcc08f073b Code drop from //branches/cupcake/...@124589 2008-12-17 18:03:49 -08:00
The Android Open Source Project
b6c1cf6de7 Initial Contribution 2008-10-21 07:00:00 -07:00