Commit graph

509 commits

Author SHA1 Message Date
Colin Cross
127fceae06 Walk up tree to find makefiles in mma
Call findmakefile in mma to walk up the tree to find the nearest
makefile.  Fixes mma in subdirectories of directories that have
Android.mk or Android.bp files.

Change-Id: I6fa509171699071fc34a2a75dd7e191d4ddca31a
2016-09-01 15:35:57 -07:00
Colin Cross
4bfae06e71 Canonicalize mmm path
Canonicalize the mmm path relative to the top level before creating the
MODULES-IN-dir target.  Fixes cd frameworks/base; mmm -j .

Test: cd frameworks/base; mmm -j
Change-Id: If7bc321e8a87b76121f876bf4bc296b0f9b80578
2016-08-31 22:00:03 -07:00
Dan Willemsen
9fc9cac0ac Merge "Fix GET-INSTALL-PATH to work with Soong"
am: 6b9aa6938d

Change-Id: I9f433cb383846ec6ccb8e39be4b30110d60d54fd
2016-08-15 21:17:33 +00: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
6f8244b62d Merge "Fix mm and mmm in Android.bp directories" am: 8ed91b6624
am: 323396993c

* commit '323396993c6651b4b98974df9e9d53118f27a840':
  Fix mm and mmm in Android.bp directories

Change-Id: I95d6bde7a0ea72b47779f1a5b0577ff423524b6f
2016-05-27 00:29:14 +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
Vishwath Mohan
9cdb6f1a31 Merge "Double quote some statements for zsh compatibility" am: 576fd3ebb9
am: 29c2c4db19

* commit '29c2c4db19c6c9f152a1c48aee368a3439cd195f':
  Double quote some statements for zsh compatibility

Change-Id: Id02db06a190370d18e3b7828a453cd16948d77c1
2016-05-23 22:29:50 +00:00
Vishwath Mohan
7d35f001e1 Double quote some statements for zsh compatibility
Two eval commands did not enclose their arguments in double quotes, and
this broke compatibility on zsh - preventing lunch from running to
completion. This CL adds the double quotes and fixes the issue.

Change-Id: I5ed884b455e2e61182f6c29fb807ed92372af039
2016-05-19 12:38:16 -07:00
Keun Soo Yim
46a259651f resolve merge conflicts of 72b82dc to nyc-dev-plus-aosp
Change-Id: I6e62226774584154ad1a802594e386fe7942504b
2016-04-25 15:27:21 -07:00
Keun Soo Yim
3d4847525f build rule change for VTS (vendor test suite)'s metadata files
Change-Id: I76b81529a97b672e08632703d2f6a2777ee8811e
2016-04-25 13:06:57 -07:00
Marie Janssen
32ec50a1f1 make croot slightly more useful
Have croot take an argument of a directory to end up in,
so we can jump around the tree even faster.

Change-Id: Ieb6a8d47fee0412006a11192b29ed44604961312
2016-04-22 16:25:29 -07:00
Chih-Hung Hsieh
a9a55c7c7e Call clang-tidy based on WITH_TIDY* variables.
* Call clang-tidy before every C/C++ compilation if
  (1) clang-tidy is found at $(PATH_TO_CLANG_TIDY)
  (2) $(my_clang) is true
  (3) LOCAL_TIDY is 1 or true, or
      LOCAL_TIDY is undefined and WITH_TIDY is 1 or true.
* clang-tidy is called with -checks=$(my_tidy_checks),
  which has default '-*,google*,-google-readability*'
  and can be overwritten by WITH_TIDY_CHECKS.
* LOCAL_TIDY_CHECKS is appended to $(my_tidy_checks)
* Extra flags are passed to clang-tidy through
  WITH_TIDY_FLAGS or LOCAL_TIDY_FLAGS.
* To quickly find and fix clang-tidy warnings, set $(WITH_TIDY_ONLY)
  to 1 or true to skip compilation of C/C++ files.
* Add a PHONY tidy_only target,
  which includes all $(cpp_objects) and $(c_objects).
* The 'mm' and 'mmm' functions are changed to call make with
  the 'tidy_only' target when WITH_TIDY_ONLY is true or 1.
  In that case, only clang-tidy is called for C and C++ files.

Bug: http://b/27779618
Change-Id: I8adcfff217d68af49849b79aacee7d7654cafb1b
2016-04-21 12:31:13 -07:00
Elliott Hughes
910a355947 Use ulimit -p rather than prlimit.
Neither is standard, but ulimit is toybox and therefore a bit more
regular and at least has help text.

Change-Id: Id7ba9adc9ca256b821d8060506010abef30dee28
2016-03-07 14:05:22 -08:00
Ying Wang
ac9092730e Small fixes.
Change-Id: Ia949ed0bc93edb78d0b029f3bd3dd584e9a00dc8
(cherry-pick from commit f0cb397a9e)
2016-03-04 14:02:25 -08:00
Ying Wang
7dfdb843b2 Speed up lunch/tapas/etc. shell utility functions.
1. Combined ~10 calls to the make build system to only one.
   We added a phony target "dump-many-vars" to the build system to dump
   "<var>=<value>" pairs. We then store the pairs as shell variables.
   With this cache get_build_var/get_abs_build_var can just return
   the shell variables instead of querying the build system.
2. Prune .git when we search for AndroidProduct.mks.

In internal source tree lunch time was reduced from ~15s to ~1.5s.

Bug: 27429759

(cherry picked from commit 08800fd905)

Change-Id: I862a0ec3c1aae97c552054dacec133e857042edf
2016-03-04 14:02:03 -08:00
Ying Wang
f0cb397a9e Small fixes.
Change-Id: Ia949ed0bc93edb78d0b029f3bd3dd584e9a00dc8
2016-03-04 13:56:23 -08:00
Ying Wang
08800fd905 Speed up lunch/tapas/etc. shell utility functions.
1. Combined ~10 calls to the make build system to only one.
   We added a phony target "dump-many-vars" to the build system to dump
   "<var>=<value>" pairs. We then store the pairs as shell variables.
   With this cache get_build_var/get_abs_build_var can just return
   the shell variables instead of querying the build system.
2. Prune .git when we search for AndroidProduct.mks.

In internal source tree lunch time was reduced from ~15s to ~1.5s.

Bug: 27429759
Change-Id: I24e88598f6fab598ef26518885fd5e86e71a772d
2016-03-04 11:01:57 -08:00
Chih-Hung Hsieh
42d5c292d9 Use new clang scan-build script.
The actual clang compiler called for static analysis is decided
by build/core/binary.mk, not the one given to --use-analyzer.

BUG: 13287788
Change-Id: I58105c20b56ce17ddf329a275c750d14284d1e25
2016-02-24 19:18:45 -08:00
Neil Fuller
fcf7c81a7f Revert "Revert "Make OpenJDK 8 the default""
Reapply the JDK 8 switch in internal builds.

This reverts commit 85bddfdedf.
2016-01-25 17:35:57 +00:00
Neil Fuller
1f495b865e Revert "Revert "Make OpenJDK 8 the default""
Reapply the switch to JDK 8 on aosp/master.

This reverts commit 85bddfdedf.

Change-Id: If2e8733ba78b007d37914c0512cd6be1bd4c1e69
2016-01-25 17:12:41 +00:00
Neil Fuller
85bddfdedf Revert "Make OpenJDK 8 the default"
Temporary revert to help out Brillo folks.
It will be resubmitted tomorrow.

This reverts commit 4495f6afb8.

Change-Id: Id378c7d3a6e72e9be50f9404b19d5763568987a5
2016-01-25 17:04:14 +00:00
Neil Fuller
4495f6afb8 Make OpenJDK 8 the default
To return to OpenJDK 7:
export LEGACY_USE_JAVA7=true

And run envsetup.sh/lunch again.

Bug: 25786468
Change-Id: I8e00591a24d13e3b8b6baaafe0fdff6536c58770
2016-01-25 10:19:25 +00:00
Neil Fuller
8f354bc8c2 Merge "Use sensible default locations for Java" 2015-11-20 10:16:17 +00:00
Neil Fuller
91e012cd99 Use sensible default locations for Java
Use sensible default locations for Java based on
the EXPERIMENTAL_USE_JAVA8 flag.

Bug: 25786468
Change-Id: I7ec035b5329785efc41b3f971d5e3ae202293576
2015-11-19 16:41:36 +00:00
Marie Janssen
4afc2c0f6f envsetup: fix for provision to work on zsh
The -p option means something else on zsh and breaks this function.

Bug: None
Change-Id: Ie0ba8119e34c616f5b8f931806063d6b1d3d893e
2015-11-10 10:41:15 -08:00
Gaurav Shah
881ec090c4 Merge "build: Add support for defining products in /product"
am: acb8a7c1f8

* commit 'acb8a7c1f8cacaf136edba1a25d64467d352a432':
  build: Add support for defining products in /product
2015-11-02 22:27:08 +00:00
Lee Campbell
455f6f458d build: Add support for defining products in /product
The build will now search for AndroidProducts.mk in /product

BUG: 22030305

Change-Id: I2d067d95d0c8dc1341a55167f9ac7f6926e04ce3
2015-11-02 14:17:47 -08:00
Mike Frysinger
2bd3f6e12c Merge "use find -exec ... + everywhere"
am: 6ff6e9552c

* commit '6ff6e9552c90d091adf4e3f686d2922585d8060f':
  use `find -exec ... +` everywhere
2015-10-22 19:44:08 +00:00
Mike Frysinger
5e47973204 use find -exec ... + everywhere
This is more efficient as find itself can handle correctly passing
arguments down to the command, and this is in POSIX.  The current
versions of OS X also support this form.

BUG=None
TEST=mgrep still works

Change-Id: Ie570867609113868daaf068658c4f7e6f4ae42fa
2015-10-22 09:50:59 -04:00
Roland Levillain
fef5ba8ec7 Merge "Typos in envsetup.sh."
am: 8503cfb49c

* commit '8503cfb49c797bffa2568cffaab483071230fef0':
  Typos in envsetup.sh.
2015-10-20 21:44:10 +00:00
Roland Levillain
39341924db Typos in envsetup.sh.
Change-Id: I31cc811e1352b9c924bdf164561f334b032d6f5c
2015-10-20 12:51:06 +01:00
Ying Wang
3a6ad87039 Merge "envsetup: Show error when supplied dir isn\'t present with mmm"
am: 475054a16a

* commit '475054a16ad57b184fa476c093cf1ce8e9ec3e15':
  envsetup: Show error when supplied dir isn't present with mmm
2015-10-19 23:21:46 +00:00
Abhinav1997
a72a6e7c72 envsetup: Show error when supplied dir isn't present with mmm
When a directory isn't present with mmm, don't show "No Android.mk present", rather show that the directory isn't present

Change-Id: I7259a60012c6f30c470daa60d5a5097d01ffc4c7
Signed-off-by: Abhinav1997 <abhinav.jhanwar.august2@gmail.com>
2015-10-19 22:38:42 +02:00
Brian Carlstrom
10abe69478 am b43cf696: am 848b8e9d: am fa2ce3b3: am f73f79f1: Merge "Use /filelist when OUT_DIR is set" into mnc-dev
* commit 'b43cf69672c72c025f0fe764d49ec950e3b57b81':
  Use $OUT_DIR/filelist when OUT_DIR is set
2015-10-04 20:05:54 +00:00
Brian Carlstrom
f2257427d9 Use $OUT_DIR/filelist when OUT_DIR is set
Change-Id: Iadf3f05e752d71371d3d74e670ade3e937b1cd92
2015-09-30 20:36:15 -07:00
David Zeuthen
2fb9d0904f am 0238e879: Merge "envsetup.sh: Add \'provision\' function."
* commit '0238e879893bbbbab4e75b0fd1355c43547ca31e':
  envsetup.sh: Add 'provision' function.
2015-09-30 21:51:55 +00:00
David Zeuthen
1b126ffedc envsetup.sh: Add 'provision' function.
This will run ${ANDROID_PRODUCT_OUT}/provision-device which in turn can
run fastboot (and other vendor-specific bits, if needed) to repartition
the device and reflash all partitions with known versions. Options
passed to the 'provision' command will be passed on to said script which
is expected to pass them on to fastboot.

Since this is a rather destructive operation involving data loss etc.,
user confirmation is required. This confirmation can be bypassed using
the option --no-confirmation.

Change-Id: Iec5667f2f5070b95d2eb70ad1b2984909ae4184c
2015-09-30 17:18:22 -04:00
Ying Wang
945bc2f288 am 92facb1f: Merge "Substitue "/" with "-" in the MODULES-IN phony goal names."
* commit '92facb1fed26492746aca267df51b6082286521c':
  Substitue "/" with "-" in the MODULES-IN phony goal names.
2015-09-24 23:59:29 +00:00
Ying Wang
61cd884a11 Substitue "/" with "-" in the MODULES-IN phony goal names.
This avoids Ninja's path canonicalization on those goal names.
Without this, Ninja complains about duplicate rules for
MODULES-IN/a/b/.. and MODULES-IN/a.

Bug: 24309760
Change-Id: Id3aa9da5d3887a2cd1426cbb5fdf35659c65805e
2015-09-24 16:24:42 -07:00
Ying Wang
2f9f1fb32f resolved conflicts for 964f06b1 to stage-aosp-master
Change-Id: I0cebad2e440ec7d605afafac893352f06ca2f419
2015-09-23 19:31:44 -07:00
Ying Wang
caeaa08f9d Re-implement mma/mmma using make goals.
Previously we use command line variable BUILD_MODULES_IN_PATHS which
causes kati to regenerate build.ninja if any variable value changes.

TODO: Remove the old rules of BUILD_MODULES_IN_PATHS in
build/core/main.mk and ninja.mk once users have re-sourced envsetup.sh.
Probably in a few weeks.

Caveat: With this change, if a user sources the new envsetup.sh, mma/mmma
won't work in old branches from the same shell.

Bug: 24309760
Change-Id: I212e82aeebaaa2bd4114e2066f1995da8886b5e2
2015-09-23 16:31:02 -07:00
Dan Albert
2afd720936 am 86e1aa1a: Merge "Move python-adb to development/python-packages."
* commit '86e1aa1a1d3593861f3a127e337fbdb8d965ee4f':
  Move python-adb to development/python-packages.
2015-09-21 17:34:25 +00:00
Dan Albert
f5caa3d3ba Move python-adb to development/python-packages.
Nothing else was being imported from system/core yet, and a path under
development makes more sense for this.

Bug: http://b/22881740
Change-Id: Ib0beb02137805b3e382535514a2bc067b7fd1d33
2015-09-18 13:40:26 -07:00
Ying Wang
1dd4dfbfd7 am 6eb3d977: Merge "Remove legacy kernel build toolchain PATH setup in envsetup.sh"
* commit '6eb3d977c5a8b7612058f1a55e648f8200de2b8f':
  Remove legacy kernel build toolchain PATH setup in envsetup.sh
2015-09-15 23:09:38 +00:00
Ying Wang
750396dd30 Remove legacy kernel build toolchain PATH setup in envsetup.sh
We used to rely on envsetup.sh to set up PATH before doing kernel build.
Now we have new kernel build process.
Also the variable doesn't work any more as we don't have corresponding arm-eabi
toolchain for the latest arm-linux-androideabi toolchain.

Change-Id: I99443fdc58e94f57f4f1f7e88da6dd127f3b2fac
2015-09-14 19:32:50 -07:00
Dan Albert
8405451f90 am 4982ef9d: am 010f652e: Merge "Add system/core to the PYTHONPATH."
* commit '4982ef9d76d4ca7189e56377a4032d8fe68fd994':
  Add system/core to the PYTHONPATH.
2015-07-31 22:31:58 +00:00
Dan Albert
515ab1e2d1 Add system/core to the PYTHONPATH.
There's an adb Python interface now, and system/core needs to be in
the PYTHONPATH for `import adb` to find it.

Change-Id: I712767a2ba96cb017ce5857dc367e4cacf2ec51f
2015-07-31 13:38:47 -07:00
Nick Kralevich
41da3d1209 am abbf8eeb: am a521a37d: Merge "mgrep: add output to environment commands"
* commit 'abbf8eeb674b1a9d9b8ac1cc8744f03144c3968c':
  mgrep: add output to environment commands
2015-07-15 21:27:43 +00:00
William Roberts
23a298b190 mgrep: add output to environment commands
Change-Id: I7a97e00c7ef5ac179333303d89511c2f72cbd100
Signed-off-by: William Roberts <william.c.roberts@intel.com>
2015-07-13 09:29:52 -07:00
Jeff Vander Stoep
e50b3ec5f8 am f9af2646: am ed6e4d19: Merge "selinux: add tools to dev path"
* commit 'f9af26462fe9dd7c68ca49a8b5b148f00d4ea3ec':
  selinux: add tools to dev path
2015-06-12 20:05:32 +00:00
Jeff Vander Stoep
5aa6832e6b selinux: add tools to dev path
Adds audit2allow to the path. No build required.

(cherry picked from 5f50f05340)
Bug: 21724977
Change-Id: Ide320a56b9cdbfa426b978443f6df07fa2a38fbc
2015-06-12 20:02:25 +00:00
Jeff Vander Stoep
5f50f05340 selinux: add tools to dev path
Adds audit2allow to the path. No build required.

Bug: 21724977
Change-Id: Ide320a56b9cdbfa426b978443f6df07fa2a38fbc
2015-06-12 10:16:06 -07:00
Ying Wang
bc0f1f5651 am ac3f88d8: am 080f57ae: Merge "Remove the unnecessary full_x86_64 and full_mips64."
* commit 'ac3f88d8a2812cd2134f9b67ec4a928d886a4eb6':
  Remove the unnecessary full_x86_64 and full_mips64.
2015-06-08 20:08:09 +00:00
Ying Wang
0a76df5ce7 Remove the unnecessary full_x86_64 and full_mips64.
For historical reason, the aosp_* products were named full_*.
We keep the full, full_x86 and full_mips in case some tools still
reference these legacy names; But no reason the have the full_* product
names for the new 64-bit archs.

Change-Id: I240ed0c6ded0ded2d80603bd0c5ff24750999afc
2015-06-08 11:57:26 -07:00
Christopher Ferris
4c4db2d809 am ce78cf40: am 6bd0bbd5: Merge "Portable way to color"
* commit 'ce78cf40a4dbdfe2644215102c1269a4e72bec8b':
  Portable way to color
2015-05-29 05:07:18 +00:00
Jacky Cao
89483b83fb Portable way to color
Change-Id: I62ae1da772f4e3eb80ed26aca89ebe47aff8efa7
2015-05-17 10:07:42 +08:00
Ying Wang
55c838f115 am 0b584f2b: am f994458b: am b4b996a8: Merge "Include vendorsetup scripts in order"
* commit '0b584f2b394051684e2506cc7304b583df29bca6':
  Include vendorsetup scripts in order
2015-04-04 21:40:06 +00:00
Oleksiy Avramchenko
15760a8a96 Include vendorsetup scripts in order
This fixes randomness of the combo index.

Change-Id: I533161fea8d1bc0c9dbd6ca2f3393d27310c9588
2015-04-03 11:58:09 +02:00
Ying Wang
131d2f15c8 am 8b6fabc4: am 18aad5fe: am 24a71e15: Merge "Return non-zero if can\'t locate top of the tree in m/mm/mmm."
* commit '8b6fabc4619f6b1c5c4c1834783268bea0e77afc':
  Return non-zero if can't locate top of the tree in m/mm/mmm.
2015-04-02 01:40:19 +00:00
Ying Wang
0c1374cc70 Return non-zero if can't locate top of the tree in m/mm/mmm.
Bug: 20017058
Change-Id: I85fac71061673d00a1b583ad13afc8567d794cd6
2015-04-01 10:16:03 -07:00
Adrian Roos
afa958f413 Allow variable overrides in mmm and mmma
Change-Id: I12e8cc62e72d0af3b777f69727eafec9aa1713e3
2015-03-05 19:52:55 +01:00
Greg Hackmann
e39b0c118a am 01e0cb2c: am fc93e284: am 6492792d: Merge "Consult tput about color control sequence support"
* commit '01e0cb2ce011e65099737ca6052d10758d885c8b':
  Consult tput about color control sequence support
2015-03-03 22:24:52 +00:00
Greg Hackmann
fc93e284dd am 6492792d: Merge "Consult tput about color control sequence support"
* commit '6492792d8a30f218fff6d54765ba5502de0a9a2a':
  Consult tput about color control sequence support
2015-03-03 19:02:37 +00:00
Greg Hackmann
6492792d8a Merge "Consult tput about color control sequence support" 2015-03-03 18:55:21 +00:00
Jeff Sharkey
ea0068a2ee Add rcgrep for searching init.rc style files.
Change-Id: Iece26217a7c59c7b2fd1bf19a7edccbe4be92947
2015-02-26 14:13:46 -08:00
Bill Yi
251412b472 Merge commit 'b89ec38113a22d09b0832ed2d3cb8fc413a14a75' into HEAD 2015-02-19 14:30:26 -08:00
Dan Albert
20ebefa899 am 0badfceb: Merge "Remove the unsets for removed gdbclient functions."
* commit '0badfcebe71805a495d151ac4df48bb48940bde0':
  Remove the unsets for removed gdbclient functions.
2015-02-17 21:13:24 +00:00
Dan Albert
b5a3e2fe9d am 8f1965ed: Merge "Remove gdbclient from envsetup."
* commit '8f1965ed0152c1f93358e3a424e9156b29c56813':
  Remove gdbclient from envsetup.
2015-02-12 21:12:36 +00:00
Dan Albert
617be5ede5 Remove the unsets for removed gdbclient functions.
Change-Id: I6bb8b42dbc7ac45bec6b8267733f9b4d6212315f
2015-02-12 11:30:06 -08:00
Dan Albert
f9631fd9db Remove gdbclient from envsetup.
gdbclient is being promoted to a real script:
https://android-review.googlesource.com/#/c/131831/

Change-Id: I4bb70ad44cec0ebf62d9e8e355c22ed8b708868b
2015-02-12 11:29:43 -08:00
Greg Hackmann
d95c7f70ab Consult tput about color control sequence support
Blocking these sequences on Darwin has false positives (Terminal.app)
and false negatives (Eclipse CDT on Linux).  Instead let's ask the
terminal what it supports.

Change-Id: I907942925a8b30abc1ea920f077b5fc3af815ba4
Signed-off-by: Greg Hackmann <ghackmann@google.com>
2015-02-12 09:52:30 -08:00
Elliott Hughes
84146f7301 am 01da8cbc: Merge "envsetup.sh : add help text for sepgrep and mangrep commands"
* commit '01da8cbc8c01d73debb14bc236e2d82ad3d7ebbc':
  envsetup.sh : add help text for sepgrep and mangrep commands
2015-01-30 05:03:11 +00:00
Trevor Drake
9c88976531 envsetup.sh : add help text for sepgrep and mangrep commands
Change-Id: Iac3942da05c1803039b9fcf15fee1fc0e0f4efda
2015-01-30 04:42:21 +00:00
Dmitriy Ivanov
5586efa028 am 23396bfc: Merge "gdbclient: Improve error handling"
* commit '23396bfc8d613f9319bce836a49ae6ee7ad18c0b':
  gdbclient: Improve error handling
2015-01-23 00:50:38 +00:00
Dmitriy Ivanov
dfff170148 gdbclient: Improve error handling
Print error message when unable to resolve exefile by pid

Change-Id: I5d04bdc348e5f95818ac90e29148947edfce42eb
2015-01-22 13:43:09 -08:00
Pirama Arumuga Nainar
e019e8206a am 53ed9df8: Merge "Fix incorrect name for x86 platform\'s gdb"
* commit '53ed9df8dcc4930fc314212433c339336f0e1b9f':
  Fix incorrect name for x86 platform's gdb
2015-01-05 22:55:43 +00:00
Pirama Arumuga Nainar
8c346f6ada Fix incorrect name for x86 platform's gdb
gdbclient looks for 'x86_64-linux-androideabi-gdb' whereas the prebuilts
have gdb as 'x86_64-linux-android-gdb'

$ cd $ANDROID_BUILD_TOP
$ find prebuilts -iname *x86*gdb
prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/bin/x86_64-linux-android-gdb
prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.8/bin/x86_64-linux-android-gdb
prebuilts/gcc/darwin-x86/x86/x86_64-linux-android-4.9/bin/x86_64-linux-android-gdb
prebuilts/gcc/darwin-x86/x86/x86_64-linux-android-4.8/bin/x86_64-linux-android-gdb

Change-Id: Ib940ecd6f345ea501da79834168b91cc0f6e5a96
2015-01-05 14:36:38 -08:00
Dan Albert
023fd1fca8 am e98755f9: Merge "Add a SANITIZE_HOST flag."
* commit 'e98755f9d6619ff141d099f9da655d141da72b8e':
  Add a SANITIZE_HOST flag.
2014-12-09 13:18:44 +00:00
Dan Albert
4ae5d4b331 Add a SANITIZE_HOST flag.
We had discussed the idea of making all host tools default to using
ASAN. Even if we don't make it the default, this makes it easy for the
user to switch all host binaries over.

Change-Id: I64a5c741b1b4e9aefed3a6be8dcd4f386e06b29c
2014-12-05 22:20:37 -08:00
Dan Albert
fc0d1e6f58 am 0616000d: Merge "Make cgrep check .hpp files as well."
* commit '0616000d09905ac423dae0ffccdb0ef3fe24f36d':
  Make cgrep check .hpp files as well.
2014-11-22 20:57:19 +00:00
Dan Albert
019611958f Make cgrep check .hpp files as well.
Change-Id: Ie8e9ce7270233ac01d7bc80bda5adc28afa158ed
2014-11-22 10:16:01 -08:00
Dan Albert
becb42cafa am fbb553dc: Merge "Colorize build success/failure message."
* commit 'fbb553dcd8a1cc65a7b2f56fca7604d5850f59c8':
  Colorize build success/failure message.
2014-11-17 19:44:17 +00:00
Dan Albert
fbb553dcd8 Merge "Colorize build success/failure message." 2014-11-17 19:34:11 +00:00
Dan Albert
b59995d0cd Colorize build success/failure message.
Change-Id: I8901689876e65f5b72050c40e1580f167e49c2b0
2014-11-14 22:37:46 -08:00
Dmitriy Ivanov
11b4800be5 am dd20e68d: Merge "Fix device detection and path to tapas"
* commit 'dd20e68d8c37b28be86f2c2a5be8350ec35dd814':
  Fix device detection and path to tapas
2014-11-14 17:58:57 +00:00
Dmitriy Ivanov
8cde5289a4 Fix device detection and path to tapas
1. Some devices do not set ro.product.device in which
    case take it from ro.hardware

 2. Add path to tapas symbols to sysroot and solib-search-path
    for tapas users only

Change-Id: I4eed2d3c3aefd95070beebdbfba4464a524c3066
2014-11-13 19:46:43 -08:00
Nick Kralevich
3f49047534 am 1b7f0f8c: am a94282c6: Mount tmpfs on /cores
* commit '1b7f0f8c1def705e255242780ef72090061237ac':
  Mount tmpfs on /cores
2014-11-05 05:21:19 +00:00
Iliyan Malchev
e04299a84c am 854252d2: am af5de97b: rename coredump-* --> coredump_*
* commit '854252d2957c792ce19aba6c3b99194abb688a07':
  rename coredump-* --> coredump_*
2014-11-05 05:13:22 +00:00
Nick Kralevich
a94282c659 Mount tmpfs on /cores
Proper selinux labeling support for files on rootfs was
never completely implemented. Instead of putting coredump
files on rootfs, put them on tmpfs instead.

See: http://www.mail-archive.com/seandroid-list@tycho.nsa.gov/msg01815.html

Bug: 18227650
Change-Id: I2eeabee4fe1a14bfbf990a4a518d538d6b4b6e87
2014-11-05 05:03:45 +00:00
Iliyan Malchev
af5de97b8a rename coredump-* --> coredump_*
b/18229600 shamu kernel is failing to build on build machine

Change-Id: Ia67443853443e4d7db9311bf8da69a5dc0da8e5e
Signed-off-by: Iliyan Malchev <malchev@google.com>
2014-11-04 21:01:18 -08:00
Justin Morey
c32d5a31f8 am fc133135: am 29d225c9: Set a default value for TARGET_BUILD_DENSITY
* commit 'fc13313551dec50e60fbed36f64b08dbfe5bf888':
  Set a default value for TARGET_BUILD_DENSITY
2014-11-04 20:09:32 +00:00
Justin Morey
29d225c992 Set a default value for TARGET_BUILD_DENSITY
If no density value is specified when invoking tapas, we now export
a default value of 'alldpi'

Change-Id: I12b22a4cbd0ef604826aad66c5f7ab9271eb6d57
2014-11-04 13:35:51 -06:00
Iliyan Malchev
9315262884 am eaf5b7bb: build: rename coredump-setup --> coredump_setup automerge: e675cfb
* commit 'eaf5b7bb06d92efab0c0779d38dd3b040497f51e':
  build: rename coredump-setup --> coredump_setup
2014-11-04 02:50:27 +00:00
Iliyan Malchev
e675cfbfb9 build: rename coredump-setup --> coredump_setup
b/18229600 shamu kernel is failing to build on build machine
Change-Id: I1b7e6d0ebf3e966a89ae4c7fed0cfd2db3f0a6a9
Signed-off-by: Iliyan Malchev <malchev@google.com>
2014-11-04 01:08:31 +00:00
Dmitriy Ivanov
4e44183f54 am 8d7f2e62: am bd0e8af7: Merge "Replacement for gdbclient"
* commit '8d7f2e6289ebb7e7d7a72cc3cf581b1e4ad23acf':
  Replacement for gdbclient
2014-11-01 02:24:53 +00:00
Dmitriy Ivanov
8d7f2e6289 am bd0e8af7: Merge "Replacement for gdbclient"
* commit 'bd0e8af734d5b6e28e2710bf53beb1b674e3fdb2':
  Replacement for gdbclient
2014-11-01 01:17:51 +00:00
Dmitriy Ivanov
fd0f1c848f Replacement for gdbclient
Differences between this implementation and the old one:
 1. Resolves symbols/gdb based on device information (lunch
    target is irrelevant)
 2. Works with downloaded from build-server symbols
 3. Does not require user to specify exe file - detects it automatically

Bug: 18208329

(cherry picked from commit 9b8e4b3772)

Change-Id: I13ae2debb6e2d827b9aa55e93864b5d60c2bd32e
2014-10-31 18:17:37 -07:00
Dmitriy Ivanov
9b8e4b3772 Replacement for gdbclient
Differences between this implementation and the old one:
 1. Resolves symbols/gdb based on device information (lunch
    target is irrelevant)
 2. Works with downloaded from build-server symbols
 3. Does not require user to specify exe file - detects it automatically

Change-Id: I4e7ce0a51868634593a9f104fe3f2fa67b54ca9f
2014-10-31 17:49:57 -07:00
Iliyan Malchev
2e835e714c am 2b756f79: am 248f4d53: envsetup.sh: add functions to enable and generate core dumps
* commit '2b756f79461c3cc5c227dc83e6dd3f360ad3f247':
  envsetup.sh: add functions to enable and generate core dumps
2014-10-31 22:59:59 +00:00
Iliyan Malchev
248f4d53b3 envsetup.sh: add functions to enable and generate core dumps
The shell functions in this patch enable crashing processes with the core limit
set correctly to dump core in directory /cores.  They do so by remounting the
root partition, which is RAM-backed, and by creating the 0777-chmodded /cores
under it. They also set the core file pattern in /proc/sys/kernel/core_pattern
to be /cores/core.%p, such that a core dump will have the crashing process' PID
appended to it.  You enable core-dump generation once per boot, as follows:

	coredump-setup

If a process does not have its core-size rlimit set (as most do not), you can
either set it manually by typing "adb shell prlimit <pid> 4 -1 -1", or by
typing coredump-enable <name>, e.g.

	coredump-enable $(pid mediaserver)

Alternatively, you can cause a running process to dump core by sending it a
SIGSEGV via the shell function core <name>, e.g.:

	core $(pid mediaserver)

Change-Id: Ib174e7ee95515fb9866fa6bf0d5b5bf23f3ec61b
Signed-off-by: Iliyan Malchev <malchev@google.com>
2014-10-31 13:50:58 -07:00
Neil Fuller
c5c60e2c2a am f7ce9508: am 4dfda1fa: Merge "Remove Java 6 build support"
* commit 'f7ce9508dec85c67d3a2ebe84db073a01355eba5':
  Remove Java 6 build support
2014-10-29 17:11:24 +00:00
Neil Fuller
f7ce9508de am 4dfda1fa: Merge "Remove Java 6 build support"
* commit '4dfda1fa4201e41022396b77054168ffc73b590c':
  Remove Java 6 build support
2014-10-24 20:18:15 +00:00
Jeff Hamilton
5069bd6bfa Add a density axis to tapas.
It allows overriding the density the app
is built for. Currently only used in the
GMS core APK's gradle file.

Change-Id: I3606df313a3110208cd8e6acade5f558261c921f
(cherry picked from commit 7e3d2341570681e566872216796dc4f79c8695ef)
2014-10-23 18:30:01 +00:00
Neil Fuller
46e00ea4ba Remove Java 6 build support
Change-Id: I9754844af58e3f81d7eb9dae286128d17a2cb56c
2014-10-22 10:53:59 +01:00
Christopher Ferris
855d27f629 Call art-on only when debugging ART processes.
If you are debugging a native process, SIGSEGV gets ignored by default.
Make it so that the special ART gdb macro is only called when debugging
app_processXX.

Bug: 17815162
Change-Id: Idba86860dfd94e7483f2668beeb76b3e6032fb34
2014-10-05 10:41:41 -07:00
Ying Wang
850ca0db5e Use "$@" to preserve argument word breaks
This fixes mmma broken due to quotes stripped in the argument passing.

(cherry picked from commit dcc8b3729d)

Change-Id: Ic8c4bb8e7cb347c1f80b5bc1648f63e58a010e8d
2014-09-22 17:13:08 +02:00
David 'Digit' Turner
d036711427 Merge "envsetup.sh: Fix handling of emulator prebuilts path." into lmp-dev 2014-09-16 19:33:37 +00:00
David 'Digit' Turner
50d5ccc1b2 envsetup.sh: Fix handling of emulator prebuilts path.
Due to a bad previous merge, everytime 'lunch' is called, a new
instance of prebuilts/android-emulator/<system>/ will be added
to your PATH.

This patch fixes the issue by removing the duplicate code that
should have been removed during the merge. Note that android-emulator
is still being added once to the PATH by code that appears before
in the script.

BUG=17524154

Change-Id: Iaa03159b0c81b15ef4c7c420e2f76e0a48aba789
2014-09-16 21:23:12 +02:00
Brian Carlstrom
0ff3aba580 Fix mma/mmma by making gettop canonicalize TOP when set
Bug: 17253957

(cherry picked from commit a5c4f178ae)

Change-Id: Id5f5a6e9c81d4332ef5a846423ea41384a053db6
2014-09-12 09:37:25 -07:00
Brian Carlstrom
0c837a093e Merge "Fix mma/mmma by making gettop canonicalize TOP when set" into lmp-dev 2014-09-12 16:36:21 +00:00
Brian Carlstrom
a5c4f178ae Fix mma/mmma by making gettop canonicalize TOP when set
Bug: 17253957
Change-Id: Ifd6d5984f63981e1f99b6ae6f9459c2801588459
2014-09-12 00:33:25 -07:00
Dan Albert
b7af531ecc Remove the vbox target from the build system.
I've been told this is no longer in use, and it's the only user of
external/grub, which is distressingly out of date.

Change-Id: I434a55e0d68f6db97fa71e294e983ff1802e9ba6
(cherry picked from commit de21059acf)
2014-09-11 13:48:15 -07:00
Dan Albert
de21059acf Remove the vbox target from the build system.
I've been told this is no longer in use, and it's the only user of
external/grub, which is distressingly out of date.

Change-Id: I434a55e0d68f6db97fa71e294e983ff1802e9ba6
2014-09-10 15:10:31 -07:00
Ying Wang
ed21d4c016 Allow to overrde command make in envsetup.sh.
To override define function get_make_command() in vendor's
vendor-envsetup.sh.

Change-Id: I553e60816eb789750ccd16110f2e82a5087587e8
2014-08-24 22:14:57 -07:00
Jeff Brown
e29069dc0e Merge "Tweak sgrep to add cc and aidl files." into lmp-dev 2014-08-14 16:46:52 +00:00
Ed Heyl
9e7b9b996e wrap make and print success/failure message, more later
Change-Id: I48a4687d81bc4b950a1be42b34d2f0d76733574a
(cherry picked from commit cc6be0a369)
2014-08-09 17:33:05 -07:00
Duane Sand
3c4fcd8451 [MIPS] Unite mipsel and mips64el 4.9 gcc toolchains
Use 4.9 mips64el toolchain for both 64- and 32-bit builds.
Tell ld when 32-bit links are required.
Override 4.9's changed defaults for mips floating point
register use, to get same assembler rules as 4.8 and earlier.

Also: drop unused  soft-fp build targets, cleanout redundant
compiler options, and remove extraneous Android.mk file.

(cherry picked from commit 6670e24aed)

Change-Id: I34d2f8fc6113c9d1670e3acff1aff48634b9fe1b
2014-08-05 12:28:44 -07:00
Jeff Brown
46cbd20098 Tweak sgrep to add cc and aidl files.
Also add it to the help list since it was missing.

Change-Id: I11403e63bc421fd146ad88452eac05043eacabc3
2014-07-26 15:19:21 -07:00
Duane Sand
6670e24aed [MIPS] Unite mipsel and mips64el 4.9 gcc toolchains
Use 4.9 mips64el toolchain for both 64- and 32-bit builds.
Tell ld when 32-bit links are required.
Override 4.9's changed defaults for mips floating point
register use, to get same assembler rules as 4.8 and earlier.

Also: drop unused  soft-fp build targets, cleanout redundant
compiler options, and remove extraneous Android.mk file.

Change-Id: I86f1075266349edb2b08a7709b9f5472d8cfda32
2014-07-23 14:16:00 -07:00
Nick Kralevich
9948b1e9ed runhat: use /data/local/tmp
Use /data/local/tmp for runhat reports, instead of the sdcard.
system_server isn't allowed to handle sdcard file descriptors, since
the sdcard could be ejected at any time, causing the kernel to kill the
system process.

This addresses the following SELinux denial:

  W/main    ( 9906): type=1400 audit(0.0:16): avc: denied { read write } for path="/mnt/shell/emulated/0/hprof-600" dev="fuse" ino=3077890536 scontext=u:r:system_server:s0 tcontext=u:object_r:fuse:s0 tclass=file

Bug: 16375996
Change-Id: I4c2053c327526c2f8e6812f4ed911a712ae9a9b8
2014-07-18 15:45:38 -07:00
Ying Wang
703709dba4 am baad790d: am f27e3fb4: am c35cc93d: Merge "Allow symlinks to device or vendor tree in envsetup.sh."
* commit 'baad790de671f680d6584edc4712a9cde823f49c':
  Allow symlinks to device or vendor tree in envsetup.sh.
2014-07-10 00:42:52 +00:00
Ying Wang
baad790de6 am f27e3fb4: am c35cc93d: Merge "Allow symlinks to device or vendor tree in envsetup.sh."
* commit 'f27e3fb4cf1d51f3abd5261d5626997c71df22b7':
  Allow symlinks to device or vendor tree in envsetup.sh.
2014-07-10 00:16:48 +00:00
Ying Wang
506410a549 Allow symlinks to device or vendor tree in envsetup.sh.
Change-Id: I1190a0b1c84fa17b3692427eb6071ffbe84bc529
2014-07-09 15:37:34 -07:00
Ying Wang
dcc8b3729d Use "$@" to preserve argument word breaks
This fixes mmma broken due to quotes stripped in the argument passing.

Change-Id: I6095c7ccf0660ba7b17a659f5df29b05e50e6303
2014-07-01 10:58:10 -07:00
Ying Wang
3e164be71d am 556efe00: am 9e05c9e4: am dc58c2a6: Merge "Remove nonexistent from /buildbot/automergers/mirror-aosp-master-to-stage-aosp-master/.repo/repo:/buildbot/automergers/mirror-aosp-master-to-stage-aosp-master/.repo/repo:/buildbot/automergers/mirror-aosp-master-to-stage-a
* commit '556efe002f852dfa5ca5331e92b1d65a32339f26':
  Remove nonexistent $ANDROID_QTOOLS from $PATH.
2014-06-30 17:39:28 +00:00
Ying Wang
556efe002f am 9e05c9e4: am dc58c2a6: Merge "Remove nonexistent from /buildbot/automergers/mirror-aosp-master-to-stage-aosp-master/.repo/repo:/buildbot/automergers/mirror-aosp-master-to-stage-aosp-master/.repo/repo:/buildbot/automergers/mirror-aosp-master-to-stage-aosp-master/.r
* commit '9e05c9e4e642673dc6d9104c44d26810773c382d':
  Remove nonexistent $ANDROID_QTOOLS from $PATH.
2014-06-30 17:36:39 +00:00
Ying Wang
2a859d5a62 Remove nonexistent $ANDROID_QTOOLS from $PATH.
Bug: 15983070
Change-Id: Id3807a6dabd616ae06aafc2b894c1858e4400e26
2014-06-30 10:25:33 -07:00
Ed Heyl
c6d11f8c66 no color output, thanks Mac; better callback to real make
Change-Id: Iff2a15ed8aad28c264209b26a33d1206ec80b794
2014-06-27 14:19:51 -07:00
Colin Cross
a58f8e04c9 build: fix vendor symbols in gdb
Set TARGET_OUT_VENDOR_SHARED_LIBRARIES_UNSTRIPPED
Append '64' for 64-bit libraries

Change-Id: Ief289bb23950d4bed84cf616cff6038fbd8caf95
2014-06-27 10:48:22 -07:00
Michael Wright
49753f8fa1 am e75101af: am e49d461a: am b0c6ea9f: Merge "Invoke debuggerd64 when appropriate with stacks."
* commit 'e75101afdfc528aed486adbc0170964d1b32a91d':
  Invoke debuggerd64 when appropriate with stacks.
2014-06-25 01:42:54 +00:00
Michael Wright
e75101afdf am e49d461a: am b0c6ea9f: Merge "Invoke debuggerd64 when appropriate with stacks."
* commit 'e49d461a8f713e61ad39ba20b48d2b5fee7beafe':
  Invoke debuggerd64 when appropriate with stacks.
2014-06-25 01:36:16 +00:00
Michael Wright
b0c6ea9f29 Merge "Invoke debuggerd64 when appropriate with stacks." 2014-06-23 21:50:22 +00:00
Michael Wright
aeed721fcc Invoke debuggerd64 when appropriate with stacks.
Read out the ELF header to see if the executable is 64-bit or 32-bit,
then call the appropriate debuggerd. In bash. Ugh.

Change-Id: I6550fe92e775659cd0370bcb70f40dd59238ad8f
2014-06-24 18:06:11 -07:00
Elliott Hughes
7df87a04f9 am dde1a37e: am fbc6f257: am c04b4455: Merge "Updated gdbclient path support."
* commit 'dde1a37eb61a807af666c2adcfcb7c197465da90':
  Updated gdbclient path support.
2014-06-23 19:54:11 +00:00
Elliott Hughes
dde1a37eb6 am fbc6f257: am c04b4455: Merge "Updated gdbclient path support."
* commit 'fbc6f25712362b1f9b7b8970a96833ed0be0f12c':
  Updated gdbclient path support.
2014-06-23 19:48:57 +00:00
Ying Wang
267a928deb am e9ef4005: am cd66e5ca: am 6a8b3b43: Merge " delete duplicate variable definition"
* commit 'e9ef4005ea41b757bf1381236acaae124110d9fb':
  delete duplicate variable definition
2014-06-23 17:01:38 +00:00
Ying Wang
e9ef4005ea am cd66e5ca: am 6a8b3b43: Merge " delete duplicate variable definition"
* commit 'cd66e5ca0a8ab3235b5a49c904a692ff9142999e':
  delete duplicate variable definition
2014-06-23 16:57:53 +00:00
Ed Heyl
cc6be0a369 wrap make and print success/failure message, more later
Change-Id: I48a4687d81bc4b950a1be42b34d2f0d76733574a
2014-06-23 15:10:49 +00:00
Elliott Hughes
c04b445568 Merge "Updated gdbclient path support." 2014-06-20 21:00:34 +00:00
Brigid Smith
7a569a6282 Updated gdbclient path support.
Now gdbclient accepts a fully qualified pathname for EXEs, which it will
not modify, or a relative pathname, to which it will prefix
"/system/bin".  As an example, each of the following now works.

Fully qualified:
adb shell gdbserver :5039 /system/bin/ping
bg
gdbclient /system/bin/ping :5039 /system/bin/ping

Relative:
adb shell gdbserver :5039 /system/bin/ping
bg
gdbclient ping :5039 /system/bin/ping

Change-Id: I1e4c9fca64c4fbc52c255271cc7f83f35c258509
2014-06-20 14:12:42 -07:00
Ying Wang
6a8b3b43bb Merge " delete duplicate variable definition" 2014-06-20 21:00:34 +00:00
Elliott Hughes
1a03ddb805 am 09a4cac1: am 7cc3174d: Merge "Removed /system/bin prefix from gdbclient."
* commit '09a4cac12e3b040fb6d18490ff444b2fdd6cb451':
  Removed /system/bin prefix from gdbclient.
2014-06-18 00:55:33 +00:00
Elliott Hughes
9b0bae3b37 am 1a03ddb8: am 09a4cac1: am 7cc3174d: Merge "Removed /system/bin prefix from gdbclient."
* commit '1a03ddb805f2efc45345aa545d1d724e75972ae7':
  Removed /system/bin prefix from gdbclient.
2014-06-18 01:54:56 +00:00
Brigid Smith
0a2712d349 Removed /system/bin prefix from gdbclient.
Now a program run through gdbclient will not automatically have
/system/bin added to its path, so programs not in /system/bin will no
longer need to be prefixed with ../../.

The following now works as an example:
 adb shell gdbserver :5039 /system/xbin/crasher
 bg
 gdbclient /system/xbin/crasher :5039 /system/xbin/crasher

And the following now no longer works:
 adb shell gdbserver :5039 /system/xbin/crasher
 bg
 gdbclient ../../system/xbin/crasher :5039 /system/xbin/crasher

Change-Id: I299b66d03915aeb1dc300e43a81c9a51f0bd7dec
2014-06-17 15:42:54 -07:00
Andrey Belous
a2b0f685bb delete duplicate variable definition
CALLED_FROM_SETUP and BUILD_SYSTEM set in get_build_var before make execution
no need to set them before calling get_build_var function

Change-Id: Ia79e11e5e3aa5c7fd337b989c16d50750b6c1442
Signed-off-by: Andrey Belous <belous.andrey@gmail.com>
2014-06-11 14:00:55 -04:00
Ying Wang
21e9474252 am b541ab6c: Support to build 64-bit unbundled binaries.
* commit 'b541ab6c51734530ed615e307f8912f32e616967':
  Support to build 64-bit unbundled binaries.
2014-05-30 01:02:44 +00:00
Ying Wang
b541ab6c51 Support to build 64-bit unbundled binaries.
Change-Id: I4656c983d60aaf535ce4d14528c28ae8cef98fd8
2014-05-29 17:57:40 -07:00
Ed Heyl
d9686fbb8c Revert, strange side affects to other (like lunch) commands.
This reverts commit 6acfdd62de.

Change-Id: Ic0a84700912570ddec70d152767a9d40f8fa71b0
2014-05-28 19:32:45 +00:00
Ed Heyl
6acfdd62de wrap make and print success/failure message, more later
Change-Id: I7debc62babcd855a2d6355dddd00f4531050151c
2014-05-28 11:14:35 -07:00
Colin Cross
949ed75bb9 am 423242b5: am 828b5183: am e45c8607: Merge changes Ibc943b75,Ib4ccf373,I30ff439b,I7bde0130
* commit '423242b59ea01dffbb7f79c7c045528f7c351c4b':
  set a prebuilt directory name for the 2nd arch
  add vendor directories to gdb shared library search path
  add 2nd arch gcc to the path
  fix paths when 2nd arch gcc is a different version
2014-05-22 19:40:46 +00:00