Commit Graph

24441 Commits

Author SHA1 Message Date
Justin Klaassen
d4e119e92f Merge "Revert "Revert "Switch from Calculator to ExactCalculator""" into mnc-dev-plus-aosp 2015-08-17 18:36:57 +00:00
Tao Bao
e3103ce2a5 am 3b409d56: am dae6455c: Merge "Add an option to include a full bootloader in incremental OTA."
* commit '3b409d56f4e142dd4afc7e11bbe4502123a46f31':
  Add an option to include a full bootloader in incremental OTA.
2015-08-17 17:55:34 +00:00
Tao Bao
3b409d56f4 am dae6455c: Merge "Add an option to include a full bootloader in incremental OTA."
* commit 'dae6455c95a30ec2742b54ce3c8a4a45b1aa65f2':
  Add an option to include a full bootloader in incremental OTA.
2015-08-17 17:48:43 +00:00
Tao Bao
dae6455c95 Merge "Add an option to include a full bootloader in incremental OTA." 2015-08-17 17:38:01 +00:00
Dan Albert
1b2187d871 Don't filter on a non-existent variable.
This used to be used for aarch64
(https://android-review.googlesource.com/#/c/80126/), but has since
been removed and now does nothing. This was then reimplemented more
generally with my_illegal_flags
(https://android-review.googlesource.com/#/c/166405/). Drop
*GLOBAL_UNSUPPORTED_CFLAGS in favor of that.

Change-Id: I3347726dd92f9d3a16783e0d9d3b685a828400b4
2015-08-17 10:36:09 -07:00
leozwang
aa6c1a1445 Add an option to include a full bootloader in incremental OTA.
Bug: 23101469
Change-Id: Iac466b83f789f10d26e8d289dce766cf0d05148b
(cherry picked from commit c1324751e79b23a63ea494f4bc784446c8f32435)
2015-08-17 10:34:01 -07:00
Tao Bao
82c47981bd Revise stash for BBOTAs when needed.
When generating incremental BBOTAs (v2 and above), we need to ensure
that the needed runtime stash is below the given threshold. If it's
running out of space on /cache, we replace the command that uses a
stash with a "new" command instead.

This may increase the OTA package size, since it is carrying more full
blocks instead of patches. It gets even worse for large files that span
a number of blocks, because currently we will store all the blocks for
the file as "new" blocks if stashing cannot be satisfied. We may further
optimize by splitting them into smaller chunks so that most of them can
still be stashed.

Bug: 22430577
Change-Id: I5a49e361adc7d3d41de2e9c08ee9b08c1e6c091a
2015-08-17 10:21:49 -07:00
Shinichiro Hamaji
5b6b6bb974 Add two flags for the latest ckati
* --regen

Re-generate build.ninja only when necessary. If either

1. .mk file is updated,
2. environment variable is updated,
3. $(wildcard) result is changed, or
4. $(shell) result is changed,

ckati will regenerate ninja file. This check takes only ~1
second, so incremental build will become much faster even
without "fastincremental" target.

* --ignore_dirty=out/%:

Some .mk files in out/ (e.g.,
out/target/product/generic/previous_build_config.mk)
are updated while ckati is running. With this flag, ckati
does not regenerate build.ninja when they look modified.
This should be OK for ninja based build, as ninja handles
command line changes nicely.

Change-Id: I7a2fca0e327d999599d6b16f06358e8a5e657565
2015-08-17 20:20:20 +09:00
Dirk Dougherty
b92c45fb98 am 6a8f88cd: adjust image placement for m hero on medium screens.
* commit '6a8f88cdec931470256ade35ffe6b8097425e36f':
  adjust image placement for m hero on medium screens.
2015-08-16 22:31:27 +00:00
Dirk Dougherty
6a8f88cdec adjust image placement for m hero on medium screens.
Change-Id: I644837bf151549ad8dbbfb194f8e699233362933
2015-08-14 21:19:22 -07:00
Stephen Hines
7b6af490e9 am 5d17a7e2: am 2e08cb6e: Merge "Add -mfpu=neon-vfpv4 if cpu is krait"
* commit '5d17a7e2adf505fd7a97782f54856c86a237369d':
  Add -mfpu=neon-vfpv4 if cpu is krait
2015-08-15 02:18:58 +00:00
Yang Ni
9d1eaaea61 am dcfb0c80: am 36600a6b: Merge "Include target api version in build system for rscpp."
* commit 'dcfb0c8018ec9e81fa79f3251a3d49a4cc90ddf4':
  Include target api version in build system for rscpp.
2015-08-15 02:18:57 +00:00
Stephen Hines
5d17a7e2ad am 2e08cb6e: Merge "Add -mfpu=neon-vfpv4 if cpu is krait"
* commit '2e08cb6e1bf90b0950c875132d2bf37b71d03fbb':
  Add -mfpu=neon-vfpv4 if cpu is krait
2015-08-15 02:12:46 +00:00
Stephen Hines
2e08cb6e1b Merge "Add -mfpu=neon-vfpv4 if cpu is krait" 2015-08-15 02:04:55 +00:00
Yang Ni
dcfb0c8018 am 36600a6b: Merge "Include target api version in build system for rscpp."
* commit '36600a6bf9b3b79327785cd740a909d3920d6519':
  Include target api version in build system for rscpp.
2015-08-14 18:46:18 +00:00
Yang Ni
36600a6bf9 Merge "Include target api version in build system for rscpp." 2015-08-14 18:39:47 +00:00
Dan Albert
7911f1b1aa am 5e9f4912: am 578acca4: Merge "Link librt on the host when using sanitizers."
* commit '5e9f491218721adecfab6ea0178cd1e4c6723a87':
  Link librt on the host when using sanitizers.
2015-08-14 01:10:46 +00:00
Dan Albert
5e9f491218 am 578acca4: Merge "Link librt on the host when using sanitizers."
* commit '578acca4e27511900eefc2f65be3e88f9127660c':
  Link librt on the host when using sanitizers.
2015-08-14 01:05:03 +00:00
Dan Albert
578acca4e2 Merge "Link librt on the host when using sanitizers." 2015-08-14 00:59:52 +00:00
Dan Albert
2922411446 Link librt on the host when using sanitizers.
The sanitizers now use shared memory.

Change-Id: Ie8fa6690374eda08ee4138b68fd628ebbfa2d0c8
2015-08-13 17:25:10 -07:00
Noah Presler
4796a8c524 Include target api version in build system for rscpp.
b/23161320

Change-Id: Ibc23309abed092e7648168fbf4b80891a44929a6
2015-08-13 17:07:56 -07:00
Joe Fernandez
28a044b7e1 am 71e0a80c: Merge "doc change: Add hero image for m and css for landing pages." into mnc-dev
* commit '71e0a80c2c2fdc26bb014685eebb874aa40f782d':
  doc change: Add hero image for m and css for landing pages.
2015-08-13 23:12:15 +00:00
Joe Fernandez
71e0a80c2c Merge "doc change: Add hero image for m and css for landing pages." into mnc-dev 2015-08-13 23:02:37 +00:00
Tao Bao
6968a724a5 am 3a2e91ca: am 8765fca2: Merge "Free the stash after its use in BBOTA v2."
* commit '3a2e91cad7ec1309c07e9d96d572c6a0bed52346':
  Free the stash after its use in BBOTA v2.
2015-08-13 22:31:27 +00:00
Tao Bao
3a2e91cad7 am 8765fca2: Merge "Free the stash after its use in BBOTA v2."
* commit '8765fca2f6013fe9d82ff00729089c98921bfb52':
  Free the stash after its use in BBOTA v2.
2015-08-13 22:26:17 +00:00
Tao Bao
8765fca2f6 Merge "Free the stash after its use in BBOTA v2." 2015-08-13 22:22:16 +00:00
Tao Bao
bb625d2099 Free the stash after its use in BBOTA v2.
In BBOTA v2, the stash size computation is inaccurate. A stash will be
used only once, so we deduct its size from stashed_blocks right after
its use. However, the stash doesn't actually get freed until being
overwritten by another stash or destroyed at the end of an update. This
leads to OTA failures due to insufficient space on /cache. This CL
changes the BBOTA v2 script to generate an explicit free right after
its use.

Bug: 23119955
Change-Id: Icdd8352bb0ff778945937c870990a888c7a4d38b
2015-08-13 14:44:38 -07:00
Dirk Dougherty
083da20347 doc change: Add hero image for m and css for landing pages.
Change-Id: I52ddba716eebf821f8f5dbd888d6e3519f4284d4
2015-08-13 12:37:34 -07:00
Justin Klaassen
53c5891460 Revert "Revert "Switch from Calculator to ExactCalculator""
This reverts commit 455ffaafcd.

Bug: 23186109
Change-Id: If768c4c85b8dbf1ffe881eca3412d92150fb019f
2015-08-13 12:19:38 -07:00
Chris Banes
0fd694f360 am 743938fb: Merge "Make sure only AppCompat (not it\'s tests) are in the docs" into mnc-dev
* commit '743938fb0d4f56d7d009486fb90891eab9b50897':
  Make sure only AppCompat (not it's tests) are in the docs
2015-08-13 17:36:54 +00:00
Chris Banes
743938fb0d Merge "Make sure only AppCompat (not it's tests) are in the docs" into mnc-dev 2015-08-13 17:28:32 +00:00
Dan Albert
dc0e7244a6 am 2c00d629: am 727b462a: Merge "Never allow -w."
* commit '2c00d62940e7f88b2168ccf3a29a1d3e84f59bfa':
  Never allow -w.
2015-08-13 17:02:13 +00:00
Dan Albert
2c00d62940 am 727b462a: Merge "Never allow -w."
* commit '727b462a92635665ce636c63123078a970654480':
  Never allow -w.
2015-08-13 16:52:55 +00:00
Dan Albert
727b462a92 Merge "Never allow -w." 2015-08-13 16:48:18 +00:00
Mike Dodd
44af8f9655 am 5bf35d06: Merge "Include new AOSP messaging app in base AOSP telephony builds." into mnc-dev
* commit '5bf35d0685ba62ded55cc63f3dd2f23b82cc645d':
  Include new AOSP messaging app in base AOSP telephony builds.
2015-08-13 15:21:46 +00:00
Mike Dodd
5bf35d0685 Merge "Include new AOSP messaging app in base AOSP telephony builds." into mnc-dev 2015-08-13 15:16:38 +00:00
Neil Fuller
53d1632681 am 5f198440: am bc7680c4: Merge "Include the okhttp.jar when compiling against internal classes"
* commit '5f19844067af27906828af7caed8e8b9c09cac4a':
  Include the okhttp.jar when compiling against internal classes
2015-08-13 10:51:04 +00:00
Neil Fuller
5f19844067 am bc7680c4: Merge "Include the okhttp.jar when compiling against internal classes"
* commit 'bc7680c4d7a94cfafcc3c925f0fbf134bc1dfcb8':
  Include the okhttp.jar when compiling against internal classes
2015-08-13 10:46:46 +00:00
Neil Fuller
bc7680c4d7 Merge "Include the okhttp.jar when compiling against internal classes" 2015-08-13 10:40:39 +00:00
Chris Banes
b916a5bcbc Make sure only AppCompat (not it's tests) are in the docs
BUG: 23169683

Change-Id: I6ab3b8c89eba17920f1265021c7960819e4371ab
2015-08-13 10:42:02 +01:00
Dianne Hackborn
42ebdfc574 am 25abc5a3: Merge "Fix issie #23116383: Include security patch level in Settings" into mnc-dev
* commit '25abc5a38e2e7f2962463aa4e5cd407ecdde689c':
  Fix issie #23116383: Include security patch level in Settings
2015-08-13 00:53:51 +00:00
Dianne Hackborn
25abc5a38e Merge "Fix issie #23116383: Include security patch level in Settings" into mnc-dev 2015-08-13 00:46:58 +00:00
Nick Kralevich
420662b9cd am c85364c9: am 5f79bcdd: Merge changes from topic \'file_contexts.bin\'
* commit 'c85364c9c91961461a6d81a37c8b30b34b02383b':
  build: switch over to file_contexts.bin only
  Update embedded.mk to support file_contexts.bin
2015-08-13 00:00:36 +00:00
Nick Kralevich
c85364c9c9 am 5f79bcdd: Merge changes from topic \'file_contexts.bin\'
* commit '5f79bcdd070f4069cd60bbe68430ee172575f9e2':
  build: switch over to file_contexts.bin only
  Update embedded.mk to support file_contexts.bin
2015-08-12 23:53:50 +00:00
Nick Kralevich
5f79bcdd07 Merge changes from topic 'file_contexts.bin'
* changes:
  build: switch over to file_contexts.bin only
  Update embedded.mk to support file_contexts.bin
2015-08-12 23:46:28 +00:00
Dianne Hackborn
e593e5c42a Fix issie #23116383: Include security patch level in Settings
Change-Id: I46303c064d1365781a2c8a05bd6087518afb2aec
2015-08-12 16:29:08 -07:00
Mike Dodd
f29b5bd380 Include new AOSP messaging app in base AOSP telephony builds.
b/23110861

Change-Id: I31ba32f3341c77ba6eb083a189dffa1a08c6c8d4
2015-08-12 15:44:04 -07:00
Dan Albert
df3fd1d128 Never allow -w.
Apparently -w will disable all warnings on GCC regardless of ordering
(clang will still respect ordering so warnings that are enabled after
-w are still respected). This is insane. Strip -w from the cflags.
Anyone that wants this flag should be turning off the specific
warnings (or just fix them), not disabling all warnings.

Change-Id: I2ba065637dfdc192921da4d9adbdc63b728c166f
2015-08-12 14:54:16 -07:00
Ian Pedowitz
3584355bb9 am a0372e20: Merge "Removing VisualizationWallpapers as it does not comply with API 23 rules" into mnc-dev
* commit 'a0372e20a24283002c2d27b372194d88e1983a3f':
  Removing VisualizationWallpapers as it does not comply with API 23 rules
2015-08-12 19:51:22 +00:00
Ian Pedowitz
a0372e20a2 Merge "Removing VisualizationWallpapers as it does not comply with API 23 rules" into mnc-dev 2015-08-12 19:41:54 +00:00