Commit graph

375 commits

Author SHA1 Message Date
Roland Levillain
39341924db Typos in envsetup.sh.
Change-Id: I31cc811e1352b9c924bdf164561f334b032d6f5c
2015-10-20 12:51:06 +01: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
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
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