Commit Graph

22239 Commits

Author SHA1 Message Date
Mathieu Chartier 7c2d49dcb9 am 7b93109e: am d7f3d8ba: am 8ca542f4: Merge "Rename dalvik.vm.usejit to debug.dalvik.vm.usejit"
* commit '7b93109e48f90f756228bfe399b67d5d8cc306b0':
  Rename dalvik.vm.usejit to debug.dalvik.vm.usejit
2015-03-17 14:47:31 +00:00
Christopher Ferris d268c14454 am e0881796: am 8081a8b5: am 13169ccb: Merge "Revert "Switch x86 and x86_64 build to use GCC 4.9""
* commit 'e088179677b50cac9ef7c1ab83e89ed338a9b7ed':
  Revert "Switch x86 and x86_64 build to use GCC 4.9"
2015-03-17 14:47:30 +00:00
Elliott Hughes e0203b17fa am bf8164f9: am 47584657: am 0f98a378: Merge "Remove netcfg from the list of base modules."
* commit 'bf8164f938f0af98b76e481de6c415fa496cfe21':
  Remove netcfg from the list of base modules.
2015-03-17 14:47:28 +00:00
Mathieu Chartier 7b93109e48 am d7f3d8ba: am 8ca542f4: Merge "Rename dalvik.vm.usejit to debug.dalvik.vm.usejit"
* commit 'd7f3d8ba74c25c80fcb5032e6b59e121e5546f98':
  Rename dalvik.vm.usejit to debug.dalvik.vm.usejit
2015-03-17 14:41:15 +00:00
Christopher Ferris e088179677 am 8081a8b5: am 13169ccb: Merge "Revert "Switch x86 and x86_64 build to use GCC 4.9""
* commit '8081a8b5960055c12ad50ba9a8651fe3adb4b370':
  Revert "Switch x86 and x86_64 build to use GCC 4.9"
2015-03-17 14:41:13 +00:00
Elliott Hughes bf8164f938 am 47584657: am 0f98a378: Merge "Remove netcfg from the list of base modules."
* commit '475846579e99aaeeddaaaf23c67435b6daca13e2':
  Remove netcfg from the list of base modules.
2015-03-17 14:41:12 +00:00
Mathieu Chartier d7f3d8ba74 am 8ca542f4: Merge "Rename dalvik.vm.usejit to debug.dalvik.vm.usejit"
* commit '8ca542f4394affd420271d8df946e199449508e6':
  Rename dalvik.vm.usejit to debug.dalvik.vm.usejit
2015-03-17 14:32:51 +00:00
Christopher Ferris 8081a8b596 am 13169ccb: Merge "Revert "Switch x86 and x86_64 build to use GCC 4.9""
* commit '13169ccba2d9e11e311babd8fc80f41c610c753e':
  Revert "Switch x86 and x86_64 build to use GCC 4.9"
2015-03-17 14:32:50 +00:00
Elliott Hughes 475846579e am 0f98a378: Merge "Remove netcfg from the list of base modules."
* commit '0f98a3781c4fab57bdd696cca3edd6614d65abe6':
  Remove netcfg from the list of base modules.
2015-03-17 14:32:48 +00:00
Mathieu Chartier 8ca542f439 Merge "Rename dalvik.vm.usejit to debug.dalvik.vm.usejit" 2015-03-17 02:04:42 +00:00
Christopher Ferris 1a97c05380 Revert "Switch x86 and x86_64 build to use GCC 4.9"
This reverts commit 533c7aa6a2.

(cherry picked from commit f123057f5e)

Change-Id: I6dd4ccb100341cf6ebf83829448b0ca7395d5468
2015-03-16 18:32:54 -07:00
Christopher Ferris 13169ccba2 Merge "Revert "Switch x86 and x86_64 build to use GCC 4.9"" 2015-03-17 01:31:16 +00:00
Christopher Ferris f123057f5e Revert "Switch x86 and x86_64 build to use GCC 4.9"
This reverts commit 533c7aa6a2.

Change-Id: I5203db8454d9af8fb438af6308106945e5dc0dbf
2015-03-17 01:29:51 +00:00
Elliott Hughes 0f98a3781c Merge "Remove netcfg from the list of base modules." 2015-03-17 00:58:29 +00:00
Andrew Hsieh a9ee744457 am 58b2f1e3: am 81f7dee7: am bf0b6df4: Merge "Switch x86 and x86_64 build to use GCC 4.9"
* commit '58b2f1e320a9682871cd4f7e4379c8bf167a2204':
  Switch x86 and x86_64 build to use GCC 4.9
2015-03-17 00:13:55 +00:00
Andrew Hsieh 58b2f1e320 am 81f7dee7: am bf0b6df4: Merge "Switch x86 and x86_64 build to use GCC 4.9"
* commit '81f7dee74cc436fa47339a884467cc241dd86dc7':
  Switch x86 and x86_64 build to use GCC 4.9
2015-03-17 00:07:39 +00:00
Andrew Hsieh 81f7dee74c am bf0b6df4: Merge "Switch x86 and x86_64 build to use GCC 4.9"
* commit 'bf0b6df4c15c2e7bbfd3a8b84d7c627cc3b7127f':
  Switch x86 and x86_64 build to use GCC 4.9
2015-03-16 23:59:04 +00:00
Andrew Hsieh bf0b6df4c1 Merge "Switch x86 and x86_64 build to use GCC 4.9" 2015-03-16 23:50:19 +00:00
Mathieu Chartier 3abfcfc17b Rename dalvik.vm.usejit to debug.dalvik.vm.usejit
Bug: 19735273
Change-Id: Ia0d748b511230f5e0c7d0763de3abeab9d6e0ca7
2015-03-16 16:29:30 -07:00
Elliott Hughes f3124b3523 Remove netcfg from the list of base modules.
It's obsolete and -- other than a mention in the reference RIL and
another in a shell script that no longer works -- unused.

Change-Id: Ibbf2613778802222865528644c7e59a2d7c68b48
2015-03-16 13:52:30 -07:00
Ying Wang f13fb8446a Merge "Apply jack redirection flag to also custom ANDROID_JACK_EXTRA_ARGS" 2015-03-16 20:29:03 +00:00
Ying Wang c2050db7d6 am 2219b1d8: am efc3a220: am d73696c1: Merge "Load cts/build/config.mk after build/core/config.mk"
* commit '2219b1d8efc20b59ae8231ac619c9ea20fe51e8e':
  Load cts/build/config.mk after build/core/config.mk
2015-03-16 20:26:23 +00:00
Ying Wang 2219b1d8ef am efc3a220: am d73696c1: Merge "Load cts/build/config.mk after build/core/config.mk"
* commit 'efc3a22009b15c389041427f8c74f551243b60d0':
  Load cts/build/config.mk after build/core/config.mk
2015-03-16 19:07:43 +00:00
Ying Wang efc3a22009 am d73696c1: Merge "Load cts/build/config.mk after build/core/config.mk"
* commit 'd73696c1fefface6f3d2311d1dead3afae01b048':
  Load cts/build/config.mk after build/core/config.mk
2015-03-16 19:01:59 +00:00
Ying Wang e9f0226655 Apply jack redirection flag to also custom ANDROID_JACK_EXTRA_ARGS
Bug: 19715777
Change-Id: I4ad9c9f51bf418afe29f5a682f630d6071cd33a2
2015-03-16 11:59:41 -07:00
Ying Wang d73696c1fe Merge "Load cts/build/config.mk after build/core/config.mk" 2015-03-16 18:57:37 +00:00
Eric Laurent 3131486892 Merge "added broadcast radio service" 2015-03-16 18:29:05 +00:00
Ying Wang f738b3bb9f Load cts/build/config.mk after build/core/config.mk
So that the cts config.mk can use global variables set by the core build
system config.mk.

Change-Id: I2571564abbb53257eee54485a3357ab1305eb870
(cherry picked from commit bacf5f8008)
2015-03-16 10:56:03 -07:00
Yohann Roussel 1ccaa8fbd8 Merge "Make Jack use tmp dir specified by TMPDIR" 2015-03-16 17:08:01 +00:00
Yohann Roussel f528e132d6 Make Jack use tmp dir specified by TMPDIR
If the environment variable is defined.

Bug: 19654122
Change-Id: Ib238a2c2eb60296a96de98a4a54e0996d4c8a958
2015-03-16 15:59:33 +01:00
Yohann Roussel f252faae65 Merge "Redirect jack warnings to stdout" 2015-03-16 14:06:29 +00:00
Andrew Hsieh 533c7aa6a2 Switch x86 and x86_64 build to use GCC 4.9
Change-Id: I41a7650d0e56c820a59c261d16afd6f0b9ec38c2
2015-03-16 13:17:59 +08:00
Tao Bao aecbda7f26 resolved conflicts for merge of 22311914 to master
Change-Id: I8684191fa3efea0ed546bbad076f8760a13c5c81
2015-03-14 00:26:06 -07:00
Tao Bao 2231191482 resolved conflicts for merge of 6502ae93 to lmp-mr1-dev-plus-aosp
Change-Id: I3ffed7f5a32363d5a4481eebddff8feff3c4ebee
2015-03-13 22:40:38 -07:00
Tao Bao 6502ae93e1 am 18b27966: Merge "Restrict the verification in block-based incremental OTAs"
* commit '18b27966a66a27da7b7199ab3e4351e9369cf060':
  Restrict the verification in block-based incremental OTAs
2015-03-14 05:08:38 +00:00
Tao Bao 18b27966a6 Merge "Restrict the verification in block-based incremental OTAs" 2015-03-14 05:01:34 +00:00
Tao Bao dd2a5892e5 Restrict the verification in block-based incremental OTAs
BlockImageDiff has three versions. Only the incremental OTAs generated
with the latest version (3) can be re-applied to the system that's
already on the target build. Otherwise, operations like move will make
unconditional changes and damage the system. During the verification
phase, abort the OTA update if BlockImageDiff is less than 3 and it
doesn't match the checksum of the source build.

Change-Id: Ic630346eab2a993a84d0aeaacd7167ef62cc24f6
(cherry picked from commit daebaa6ed3)
2015-03-13 17:57:15 -07:00
Ying Wang 13f2eff667 am d4ca3b38: am 4cbc4b39: am ae61f50a: Support to configure and build multiple custom images.
* commit 'd4ca3b38d9477cd8f163de75bff24cc97071f210':
  Support to configure and build multiple custom images.
2015-03-14 00:38:45 +00:00
Ying Wang d4ca3b38d9 am 4cbc4b39: am ae61f50a: Support to configure and build multiple custom images.
* commit '4cbc4b392da57c34626af38a4ea0fe4dc115af57':
  Support to configure and build multiple custom images.
2015-03-14 00:31:44 +00:00
Ying Wang 4cbc4b392d am ae61f50a: Support to configure and build multiple custom images.
* commit 'ae61f50a680d4a8e91274b35305dc2e24959abbe':
  Support to configure and build multiple custom images.
2015-03-14 00:17:52 +00:00
Ying Wang ae61f50a68 Support to configure and build multiple custom images.
Build additional images requested by the product makefile.
This script gives the ability to build multiple additional images and
you can configure what modules/files to include in each image.
1. Define PRODUCT_CUSTOM_IMAGE_MAKEFILES in your product makefile.
   PRODUCT_CUSTOM_IMAGE_MAKEFILES is a list of makefiles.
   Each makefile configures an image.
   For image configuration makefile foo/bar/xyz.mk, the built image
   file name
   will be xyz.img. So make sure they won't conflict.
2. In each image's configuration makefile, you can define variables:
  - CUSTOM_IMAGE_MOUNT_POINT, the mount point, such as "oem", "odm"
    etc.
  - CUSTOM_IMAGE_PARTITION_SIZE
  - CUSTOM_IMAGE_FILE_SYSTEM_TYPE
  - CUSTOM_IMAGE_DICT_FILE, a text file defining a dictionary
    accepted by BuildImage() in tools/releasetools/build_image.py.
  - CUSTOM_IMAGE_MODULES, a list of module names you want to include
    in the image; Not only the module itself will be installed to proper
    path in the image, you can also piggyback additional files/directories
    with the module's LOCAL_PICKUP_FILES.
  - CUSTOM_IMAGE_COPY_FILES, a list of "<src>:<dest>" to be copied to
    the image. <dest> is relativ to the root of the image.

To build all those images, run "make custom_images".

Bug: 19609718
Change-Id: Ic73587e08503a251be27797c7b00329716051927
(cherry picked from commit 5fcf1094f9)
2015-03-14 00:06:54 +00:00
Ying Wang 7c4a530666 Merge "Support to configure and build multiple custom images." 2015-03-13 23:55:28 +00:00
Ying Wang 5fcf1094f9 Support to configure and build multiple custom images.
Build additional images requested by the product makefile.
This script gives the ability to build multiple additional images and
you can configure what modules/files to include in each image.
1. Define PRODUCT_CUSTOM_IMAGE_MAKEFILES in your product makefile.
   PRODUCT_CUSTOM_IMAGE_MAKEFILES is a list of makefiles.
   Each makefile configures an image.
   For image configuration makefile foo/bar/xyz.mk, the built image
   file name
   will be xyz.img. So make sure they won't conflict.
2. In each image's configuration makefile, you can define variables:
  - CUSTOM_IMAGE_MOUNT_POINT, the mount point, such as "oem", "odm"
    etc.
  - CUSTOM_IMAGE_PARTITION_SIZE
  - CUSTOM_IMAGE_FILE_SYSTEM_TYPE
  - CUSTOM_IMAGE_DICT_FILE, a text file defining a dictionary
    accepted by BuildImage() in tools/releasetools/build_image.py.
  - CUSTOM_IMAGE_MODULES, a list of module names you want to include
    in the image; Not only the module itself will be installed to proper
    path in the image, you can also piggyback additional files/directories
    with the module's LOCAL_PICKUP_FILES.
  - CUSTOM_IMAGE_COPY_FILES, a list of "<src>:<dest>" to be copied to
    the image. <dest> is relativ to the root of the image.

To build all those images, run "make custom_images".

Bug: 19609718
Change-Id: Ic73587e08503a251be27797c7b00329716051927
2015-03-13 16:48:02 -07:00
Dan Albert f2178b39fe resolved conflicts for merge of 78c6a1cb to master
Change-Id: I279fa5c59cd08ff555e8140fa2ed86de4ff30c1f
2015-03-13 16:40:08 -07:00
Dan Albert 14dc458c4b am 92b00822: am e685e849: am 8de543fd: Merge "Switch NDK libraries to 4.9 for x86_64 and mips64"
* commit '92b0082275401921bedba06e1771ebe1814ec3cf':
  Switch NDK libraries to 4.9 for x86_64 and mips64
2015-03-13 23:35:15 +00:00
Dan Albert a82318bf42 am 4d45d6d8: am b478d625: am 9db3e6c6: Merge "Support "LOCAL_FDO_SUPPORT := always"."
* commit '4d45d6d8b0296bf6351ad02f9b607289d3cbaf22':
  Support "LOCAL_FDO_SUPPORT := always".
2015-03-13 23:35:09 +00:00
Dan Albert f5a2d7b9ee am 169f16f8: am fd496a64: am c70805ee: Merge "Set up environmental variable PATH before calling releasetools scripts."
* commit '169f16f808cd86c9e32f1f14ec7ed3c74844120d':
  Set up environmental variable PATH before calling releasetools scripts.
2015-03-13 23:35:08 +00:00
Dan Albert c9a67eb478 am ba64cebf: am 7c4a3464: am fcd0d98b: Merge "include oem.prop files in otatools_package"
* commit 'ba64cebf148394cfea66d5b41a200ed207df610d':
  include oem.prop files in otatools_package
2015-03-13 23:35:06 +00:00
Dan Albert 78c6a1cb1a am c37d7043: am 3ad14218: Merge "Strip prebuilt shared library by default."
* commit 'c37d7043e6fde29bf14218c31132dc48a9f7e995':
  Strip prebuilt shared library by default.
2015-03-13 23:29:06 +00:00
Dan Albert 92b0082275 am e685e849: am 8de543fd: Merge "Switch NDK libraries to 4.9 for x86_64 and mips64"
* commit 'e685e849c02bb75bf0d9c871e87556472c4fca73':
  Switch NDK libraries to 4.9 for x86_64 and mips64
2015-03-13 23:29:05 +00:00