Commit Graph

26369 Commits

Author SHA1 Message Date
Yohann Roussel 0a24035cf6 Merge "Do not set Jack source version, use default"
am: 2983fd4b0f

* commit '2983fd4b0f66e58620afd57d5f68794c0767b641':
  Do not set Jack source version, use default
2015-12-21 05:01:36 -08:00
Yohann Roussel 2983fd4b0f Merge "Do not set Jack source version, use default" 2015-12-21 12:57:29 +00:00
Sami Tolvanen ba788ce6e6 Merge "build_image: don\'t call append2simg for FEC"
am: e2476f82a1

* commit 'e2476f82a1c83c5efda8d8e29d25305439e91985':
  build_image: don't call append2simg for FEC
2015-12-21 11:30:44 +00:00
Sami Tolvanen c734083df3 Merge "build_image: remove an unnecessary call to append2simg"
am: 06b4ff6696

* commit '06b4ff6696dfc11fafde52e17c6e9d46f0ec1be5':
  build_image: remove an unnecessary call to append2simg
2015-12-21 11:30:35 +00:00
Sami Tolvanen e2476f82a1 Merge "build_image: don't call append2simg for FEC" 2015-12-21 11:21:16 +00:00
Sami Tolvanen 06b4ff6696 Merge "build_image: remove an unnecessary call to append2simg" 2015-12-21 11:19:26 +00:00
Shinichiro Hamaji f2f5294cb1 Merge "Disable goma/ccache with USE_XXX=false"
am: 6c90e49f4a

* commit '6c90e49f4a70e100a56e2a1b2f2550a782c72311':
  Disable goma/ccache with USE_XXX=false
2015-12-21 05:51:26 +00:00
Shinichiro Hamaji 6c90e49f4a Merge "Disable goma/ccache with USE_XXX=false" 2015-12-21 05:48:44 +00:00
Elliott Hughes 3a8929bd5a Merge "Enable -fstack-protector-strong for arm64."
am: 03b7effb8d

* commit '03b7effb8d018eb248fed9e6856a7b8795cdb907':
  Enable -fstack-protector-strong for arm64.
2015-12-18 13:45:31 -08:00
Elliott Hughes d51fd72f73 Merge "Enable -fstack-protector-strong for arm."
am: 7fca8a373f

* commit '7fca8a373f9885d4cb23145a5b457d7f2f1c5f22':
  Enable -fstack-protector-strong for arm.
2015-12-18 13:45:23 -08:00
Alex Klyubin fe20ca0229 Merge "Move signapk sources to src dir."
am: 421d84f911

* commit '421d84f911218387dc638dd7ef897aa3199b96b6':
  Move signapk sources to src dir.
2015-12-18 13:45:16 -08:00
Elliott Hughes 03b7effb8d Merge "Enable -fstack-protector-strong for arm64." 2015-12-18 21:36:49 +00:00
Elliott Hughes 7fca8a373f Merge "Enable -fstack-protector-strong for arm." 2015-12-18 21:36:27 +00:00
Dan Willemsen 93b8a1294c Prevent changes to COMMON_GLOBAL_C(PP)FLAGS
Reorder the definitions of the core cflags so that we can prevent device
configurations from changing the global C(PP)FLAGS.

There is no reason for devices to be configuring the global cflags -- if
something needs to change for a particular device, that flag should be
defined in the BoardConfig.mk, then used in the individual makefiles
where it is needed. The common global flags also affected host tools,
which should not change between device configurations.

Bug: 26165350
Change-Id: Icece4505ce3d2a9168087d802953378534018d47
2015-12-18 12:57:57 -08:00
Tianjie Xu fc3422ad36 Check block0 for remounting partition R/W
Add a function check_first_block to read block0 and output a message
on screen if the device has been remounted. The function is called
for version >= 4 only; it executes after a failing block verification
and before recovery attempts.

Bug: 21124327
Change-Id: I49dc0b861c702698896a2495ca094215705d4650
(cherry picked from commit 9dac797013)
2015-12-18 11:05:34 -08:00
Alex Klyubin 421d84f911 Merge "Move signapk sources to src dir." 2015-12-18 18:06:37 +00:00
Sami Tolvanen 4a0600406e build_image: don't call append2simg for FEC
append2simg can be slow, so generate error correction data before verity
data is appended, and append all metadata to the image at the same time.

Needs matching changes from
  I09349368925e5e2f2a7961a712a1e933eb0b9ec8

Bug: 26251929
Change-Id: Iea8cee0aee353b4d029d9581e8fbd68ec7b7dd4b
2015-12-18 15:50:25 +00:00
Sami Tolvanen ff914f5dd0 build_image: remove an unnecessary call to append2simg
append2simg on a large image is fairly slow, so append verity metadata to
the hash tree to avoid two calls.

Bug: 26251929
Change-Id: I5ec84dcd6e8500e990af13b1f9cef5e809b41605
2015-12-18 13:28:25 +00:00
Yohann Roussel 09ee66e2b4 Do not set Jack source version, use default
Default source version is 1.7 in Jack B and Jack C so this means no
change to default. Not forcing it in the build rules will allow to
change it in LOCAL_JACK_FLAGS.

Bug: 26257295
Change-Id: If9b5fe250eea4bc6bcb3c16ad9cf7024d399ff3c
2015-12-18 10:30:21 +01:00
Shinichiro Hamaji d78cba12fe Disable goma/ccache with USE_XXX=false
Bug: 26009364
Change-Id: Ic0001e6fdc62ca2373309bfe3127c5fec64d2d85
2015-12-18 15:26:17 +09:00
Neil Fuller 401aae0783 Merge "Set -Xdoclint:none"
am: d49e55561a

* commit 'd49e55561aa139af1b7c5a2f448ab5c7d93272d6':
  Set -Xdoclint:none
2015-12-17 10:27:33 +00:00
Neil Fuller d49e55561a Merge "Set -Xdoclint:none" 2015-12-17 10:18:28 +00:00
Dan Willemsen 05177f7cb1 Merge "Define __BRILLO__ only for target modules"
am: e63d3328df

* commit 'e63d3328dfc5a3e46233bf6fcc20a17e15d3545c':
  Define __BRILLO__ only for target modules
2015-12-16 23:39:27 +00:00
Dan Willemsen e63d3328df Merge "Define __BRILLO__ only for target modules" 2015-12-16 23:30:40 +00:00
Dan Willemsen 152755aa81 Merge "Move __BRILLO__ to the core build system"
am: 3931873418

* commit '39318734186de8b2ed09d827f69877bf9bb8c9aa':
  Move __BRILLO__ to the core build system
2015-12-16 23:25:10 +00:00
Dan Willemsen 3931873418 Merge "Move __BRILLO__ to the core build system" 2015-12-16 23:14:09 +00:00
Dan Willemsen de6494b9ae Define __BRILLO__ only for target modules
__ANDROID__ is only defined for target modules, do the same for
__BRILLO__.

Change-Id: Ie1417e1a5b21c051acf05b2bd3bdb3ddd31be878
2015-12-16 15:04:51 -08:00
Todd Poynor 77d1b2ec31 Merge "Make squashfs sparse image generation optional"
am: ffce16c7e6

* commit 'ffce16c7e6bdabb909a36c2b97b7881eddd5ba54':
  Make squashfs sparse image generation optional
2015-12-16 22:32:31 +00:00
Dan Willemsen 16e7e0f556 Move __BRILLO__ to the core build system
In preparation for locking down COMMON_GLOBAL_CFLAGS.

Bug: 26165350
Change-Id: Ifdfb7808c1e1b624ffb0f99ab443ec2c5503a81c
2015-12-16 14:28:21 -08:00
Todd Poynor ffce16c7e6 Merge "Make squashfs sparse image generation optional" 2015-12-16 22:12:53 +00:00
Ying Wang 71aaa02533 Merge "make USER limited to 6 characters when generating BUILD_NUMBER"
am: e9430e2361

* commit 'e9430e2361d152cae00e779fd055454fc0acf209':
  make USER limited to 6 characters when generating BUILD_NUMBER
2015-12-16 21:50:08 +00:00
Ying Wang e9430e2361 Merge "make USER limited to 6 characters when generating BUILD_NUMBER" 2015-12-16 21:42:07 +00:00
Narayan Kamath 8abec039ff Set -Xdoclint:none
Mac builds use a javadoc tool that fails on more warnings than linux
builds.  Add -Xdoclint:none to all java 8 standard doclet javadoc
commands.

Don't add it to javadoc commands that use the com.google.doclava.Doclava
doclet, it doesn't understand -Xdoclint:none.

(cherry-picked from commit 8bf7b5d51a)

Change-Id: Ic5b8431ec2facb7989473b06ebe07246f6d2317f
2015-12-16 19:26:02 +00:00
Gina Dimino 2635974ed8 Merge "Docs: Replace custom search engine Bug: 25778395"
am: 36412fa8f9

* commit '36412fa8f9cc59c3aa31988d8a38576aeae6b6bd':
  Docs: Replace custom search engine Bug: 25778395
2015-12-16 19:01:13 +00:00
Gina Dimino 36412fa8f9 Merge "Docs: Replace custom search engine Bug: 25778395" 2015-12-16 18:49:42 +00:00
Gina Dimino 8cc3a9e117 Docs: Replace custom search engine
Bug: 25778395

Change-Id: I432698f63088a3e4ec285e46c7de2295c4cefad3
2015-12-16 10:00:33 -08:00
Than McIntosh 831b4bca1b Merge "Re-enable gold linker for aarch64."
am: 9d76c75782

* commit '9d76c757820701587013aa295f4482c915d4b166':
  Re-enable gold linker for aarch64.
2015-12-16 12:10:32 +00:00
Than McIntosh 9d76c75782 Merge "Re-enable gold linker for aarch64." 2015-12-16 12:02:04 +00:00
weiqiao c9219c2c73 make USER limited to 6 characters when generating BUILD_NUMBER
BUILD_NUMBER is use to generate ro.build.description and
ro.build.display.id, if USER is long, these properties will
exceed 91 characters easily.

Change-Id: I7f99ef351f80210172a873104edd980b36c3f8f1
Signed-off-by: weiqiao <qiaowei224@gmail.com>
2015-12-16 13:28:21 +08:00
Todd Poynor b2a555e6fc Make squashfs sparse image generation optional
Allow non-sparse squashfs image generation, a la ext filesystems.

Bug: 26218766
Change-Id: Ifd596af16411e0cf69a2e7e05d725fd9442dc79c
2015-12-15 20:11:12 -08:00
Colin Cross 17f2961cd6 Merge "Tell soong that it is embedded in a make build"
am: 61b771e79f

* commit '61b771e79f19f19eae62d1b7a97d105ef6222cff':
  Tell soong that it is embedded in a make build
2015-12-16 01:57:20 +00:00
Colin Cross 17d3f5426b Merge "Combine soong builds into make builds"
am: 3bfc560cc5

* commit '3bfc560cc54b58376d095aeaf22d3a74726bcec7':
  Combine soong builds into make builds
2015-12-16 01:57:07 +00:00
Colin Cross 61b771e79f Merge "Tell soong that it is embedded in a make build" 2015-12-16 01:47:14 +00:00
Dan Willemsen 5f38f9be22 Tell soong that it is embedded in a make build
So that it can munge its ninja targets to not conflict with make.

Change-Id: I0c2273c0ca2fdfced1fa1590f2ea3eac8cddb905
2015-12-16 01:47:02 +00:00
Colin Cross 3bfc560cc5 Merge "Combine soong builds into make builds" 2015-12-16 01:46:52 +00:00
Colin Cross 1452e0a389 Merge "Remove unneccessary TARGET_BUILD_APPS conditional"
am: e416a5f716

* commit 'e416a5f71638bc324a368e4c66a4834117322c7a':
  Remove unneccessary TARGET_BUILD_APPS conditional
2015-12-16 01:33:33 +00:00
Colin Cross e416a5f716 Merge "Remove unneccessary TARGET_BUILD_APPS conditional" 2015-12-16 00:56:08 +00:00
Colin Cross 3ebb2f7326 Combine soong builds into make builds
Bootstrap soong if necessary, and wrap the kati and soong ninja files
into a single ninja file.

Change-Id: I0000c7eaa1adda763189681c57ec27a97a12ee1f
2015-12-15 16:05:57 -08:00
Colin Cross 493205eee4 Remove unneccessary TARGET_BUILD_APPS conditional
The prebuilt tools no longer conflict with the tools built from source,
remove the conditional.

Change-Id: Id334e25d9cfa2d5934450dd223bc9e30cd890062
2015-12-15 15:49:53 -08:00
Ying Wang 13a225ff9f Merge "Remove the prebuilt tools cleanstep logic."
am: cff032ca54

* commit 'cff032ca54f4dfc06f88b863d09c66040151bc36':
  Remove the prebuilt tools cleanstep logic.
2015-12-15 21:56:59 +00:00