Commit Graph

23638 Commits

Author SHA1 Message Date
Tao Bao df4cb0b2c1 releasetools: Add --oem_no_mount option.
We may have devices with OEM-specific properties but without an OEM
partition (e.g. the properties might be set by init based on hardware
SKUs). For such devices, we supply --oem_no_mount to skip mounting the
OEM partition in the updater-script. The option is only meaningful when
-o (--oem_settings) is specified.

Bug: 27359929
Change-Id: Ic08396e478a82be4188e980e704b33b4f704a8d7
(cherry picked from commit 8608cde944)
2016-02-26 16:10:34 -08:00
Ying Wang e511a07677 Allow to build against Mac OS X SDK 10.11. am: 7f7c698959
am: 773b017ee9

* commit '773b017ee96ace4e4bdc176dd59fc14c979736ef':
  Allow to build against Mac OS X SDK 10.11.
2016-02-24 02:55:16 +00:00
Ying Wang 2114b48a14 Update mac_sdk_versions_supported. am: 8df3355f64
am: 0954a9d91f

* commit '0954a9d91f8f68133150a39afc364e1ad091a19b':
  Update mac_sdk_versions_supported.
2016-02-24 02:54:51 +00:00
Ying Wang 773b017ee9 Allow to build against Mac OS X SDK 10.11.
am: 7f7c698959

* commit '7f7c6989590bd9395e8ebf3a01b5b4033c89d7d1':
  Allow to build against Mac OS X SDK 10.11.
2016-02-24 02:46:46 +00:00
Ying Wang 0954a9d91f Update mac_sdk_versions_supported.
am: 8df3355f64

* commit '8df3355f64119adb9ca71c9f2cc9b51afb61c65a':
  Update mac_sdk_versions_supported.
2016-02-24 02:46:36 +00:00
Ying Wang 7f7c698959 Allow to build against Mac OS X SDK 10.11.
Bug: 24739158
Change-Id: I7c57e141dd02a0d2de5a7a1ccbc72ffe422a8d6f
2016-02-23 18:15:15 -08:00
Ying Wang 8df3355f64 Update mac_sdk_versions_supported.
Now we requires Mac OS X SDK version at least 10.8.
Also removed the unnecessary sort call in getting
mac_sdk_versions_installed.
Lexical sort doesn't make sense when 10.10 is added to that list.
Actually the next makefile line makes sure we always get the first
match in $(mac_sdk_versions_supported):
mac_sdk_version := $(firstword $(filter $(mac_sdk_versions_installed),
$(mac_sdk_versions_supported)))

Bug: 22825165
Change-Id: I4bfafabb11f94b66704d4799fe61fe3f16429538
2016-02-23 18:13:03 -08:00
Zach Jang fc30358acb Updating security string patch to 2016-04-01 am: e182d2a95c am: 054bbb9766 am: 7e6a1633c8 am: eb651e2e45
am: 3f53b385de

* commit '3f53b385dec6b45d0e4d07a29ce43b3c510b1d10':
  Updating security string patch to 2016-04-01
2016-02-19 22:22:57 +00:00
Zach Jang 3f53b385de Updating security string patch to 2016-04-01 am: e182d2a95c am: 054bbb9766 am: 7e6a1633c8
am: eb651e2e45

* commit 'eb651e2e450f1756e6acea4f570379af7d146920':
  Updating security string patch to 2016-04-01
2016-02-19 22:17:28 +00:00
Zach Jang eb651e2e45 Updating security string patch to 2016-04-01 am: e182d2a95c am: 054bbb9766
am: 7e6a1633c8

* commit '7e6a1633c8ebb622271020cbb0aedae355e6501a':
  Updating security string patch to 2016-04-01
2016-02-19 22:11:32 +00:00
Zach Jang 7e6a1633c8 Updating security string patch to 2016-04-01 am: e182d2a95c
am: 054bbb9766

* commit '054bbb9766312a2caefd5375341d49074a6d25bf':
  Updating security string patch to 2016-04-01
2016-02-19 22:06:14 +00:00
Zach Jang 054bbb9766 Updating security string patch to 2016-04-01
am: e182d2a95c

* commit 'e182d2a95c52e37d2a6f924c8ff386b52b08a0c9':
  Updating security string patch to 2016-04-01
2016-02-19 22:00:21 +00:00
Zach Jang e182d2a95c Updating security string patch to 2016-04-01
b/27272697

Change-Id: I99c2c892a21f4c36226ea5f8d94689d6218ccf7e
2016-02-19 13:50:29 -08:00
Zach Jang 6facd249d5 Updating security patch string to 2016-03-01 am: c24c6ccd4d am: 293887c43e am: 53e7d9bf7f am: c9da4cce57
am: 6c61548bb7

* commit '6c61548bb7e426704760c9351e3211fb45d67dae':
  Updating security patch string to 2016-03-01
2016-01-12 01:33:23 +00:00
Zach Jang 6c61548bb7 Updating security patch string to 2016-03-01 am: c24c6ccd4d am: 293887c43e am: 53e7d9bf7f
am: c9da4cce57

* commit 'c9da4cce57d387f52b675d1024459af5e73c6dbc':
  Updating security patch string to 2016-03-01
2016-01-12 01:30:53 +00:00
Zach Jang c9da4cce57 Updating security patch string to 2016-03-01 am: c24c6ccd4d am: 293887c43e
am: 53e7d9bf7f

* commit '53e7d9bf7f298c438157dccc5222b7484b083d9e':
  Updating security patch string to 2016-03-01
2016-01-12 01:28:37 +00:00
Zach Jang 53e7d9bf7f Updating security patch string to 2016-03-01 am: c24c6ccd4d
am: 293887c43e

* commit '293887c43ee5b797f8628f5983f64bf766002009':
  Updating security patch string to 2016-03-01
2016-01-12 01:26:41 +00:00
Zach Jang 293887c43e Updating security patch string to 2016-03-01
am: c24c6ccd4d

* commit 'c24c6ccd4d5de8be010b74b9021b8fdb926e1dad':
  Updating security patch string to 2016-03-01
2016-01-12 01:24:55 +00:00
Zach Jang c24c6ccd4d Updating security patch string to 2016-03-01
b/26499556

Change-Id: I18a5ad9d8d08e2050053bcebc1a9a0c46db86733
2016-01-11 17:12:37 -08:00
Zach Jang 4c51cd1a9b DO NOT MERGE - Update security string to 2016-02-01 am: 929a4abd2b am: af970fb308 am: 41846b0063 -s ours am: db4d57a84c
am: 02115bf55a

* commit '02115bf55a840790bbbca3c452a85bc97381522a':
  DO NOT MERGE - Update security string to 2016-02-01
2015-12-09 23:09:34 +00:00
Zach Jang 02115bf55a DO NOT MERGE - Update security string to 2016-02-01 am: 929a4abd2b am: af970fb308 am: 41846b0063 -s ours
am: db4d57a84c

* commit 'db4d57a84c8f0f6b51d9b69c2e0ec3ac825270c0':
  DO NOT MERGE - Update security string to 2016-02-01
2015-12-09 23:06:44 +00:00
Zach Jang db4d57a84c DO NOT MERGE - Update security string to 2016-02-01 am: 929a4abd2b am: af970fb308
am: 41846b0063  -s ours

* commit '41846b00633d3eba58193565c8f6c213006cea5d':
  DO NOT MERGE - Update security string to 2016-02-01
2015-12-09 23:03:18 +00:00
Zach Jang 41846b0063 DO NOT MERGE - Update security string to 2016-02-01 am: 929a4abd2b
am: af970fb308

* commit 'af970fb308dd7914e8dccb56e8ea08d50e92e617':
  DO NOT MERGE - Update security string to 2016-02-01
2015-12-09 23:00:35 +00:00
Zach Jang 8b5be4dd4f Update Security String to 2016-02-01 am: f0f73c06e2
am: 5e2b003a11

* commit '5e2b003a116c8de6bfadf4b74d0cc676e0ed0d76':
  Update Security String to 2016-02-01
2015-12-09 23:00:35 +00:00
Zach Jang af970fb308 DO NOT MERGE - Update security string to 2016-02-01
am: 929a4abd2b

* commit '929a4abd2b777715bc730593aee87643a30706d6':
  DO NOT MERGE - Update security string to 2016-02-01
2015-12-09 14:57:15 -08:00
Zach Jang 5e2b003a11 Update Security String to 2016-02-01
am: f0f73c06e2

* commit 'f0f73c06e25e17ecf8e06f42c51efac102597f57':
  Update Security String to 2016-02-01
2015-12-09 14:57:15 -08:00
Zach Jang 929a4abd2b DO NOT MERGE - Update security string to 2016-02-01
b/26110717

Change-Id: Ifbb78b8c7cd5d2efa9e5501fc4e7216f336ccadc
2015-12-09 14:45:57 -08:00
Zach Jang f0f73c06e2 Update Security String to 2016-02-01
b/26110717

Change-Id: I1085f5d053b07c6c81d2ef22fbba5ab9157a67f2
2015-12-09 20:48:10 +00:00
Vince Harron 5806531f92 Shorten TARGET_BRAND from generic_<arch> to Android
Switching to userdebug emulator images increased ro.build.fingerprint
Past the 91 character limit.  This should bring the build server
builds under this limit.

Fixing it for local builds will be a bit more difficult.

Bug: 25829506

Change-Id: I7daee3478716adcb860cced1b770a2d00a72f1a2
(cherry picked from commit efbeab78d3581009b3da20991a3a83d733393f45)
2015-11-24 18:51:59 +00:00
Zach Jang a68c55822c Update Security String to 2016-01-01 - DO NOT MERGE am: 58cdbdc5ad am: 645f200ae8 am: 2cd2a76c64 -s ours am: c7b96cdd5e
am: 8909bdfc4a

* commit '8909bdfc4abd8ffc6511c864fe968530abe40b8a':
  Update Security String to 2016-01-01 - DO NOT MERGE
2015-11-21 01:07:24 +00:00
Zach Jang 8909bdfc4a Update Security String to 2016-01-01 - DO NOT MERGE am: 58cdbdc5ad am: 645f200ae8 am: 2cd2a76c64 -s ours
am: c7b96cdd5e

* commit 'c7b96cdd5e83ea7c62912bc779e7bc49c59023c7':
  Update Security String to 2016-01-01 - DO NOT MERGE
2015-11-21 01:01:49 +00:00
Zach Jang c7b96cdd5e Update Security String to 2016-01-01 - DO NOT MERGE am: 58cdbdc5ad am: 645f200ae8
am: 2cd2a76c64  -s ours

* commit '2cd2a76c64dead0b057b7e9a1223f67f9a9d2e7f':
  Update Security String to 2016-01-01 - DO NOT MERGE
2015-11-21 00:58:36 +00:00
Zach Jang 2cd2a76c64 Update Security String to 2016-01-01 - DO NOT MERGE am: 58cdbdc5ad
am: 645f200ae8

* commit '645f200ae8708414d06618989328dc3e3c84a917':
  Update Security String to 2016-01-01 - DO NOT MERGE
2015-11-21 00:55:17 +00:00
Zach Jang 645f200ae8 Update Security String to 2016-01-01 - DO NOT MERGE
am: 58cdbdc5ad

* commit '58cdbdc5ad54f9c26d94860c2d0be712f88a8f07':
  Update Security String to 2016-01-01 - DO NOT MERGE
2015-11-21 00:51:39 +00:00
Zach Jang 3ce70dfe46 Update Security String to 2016-01-01 to mnc-dev am: 170459f438
am: bcf2866fb1

* commit 'bcf2866fb1ea50ea31ede70f62b864332f61b980':
  Update Security String to 2016-01-01 to mnc-dev
2015-11-21 00:51:39 +00:00
Zach Jang bcf2866fb1 Update Security String to 2016-01-01 to mnc-dev
am: 170459f438

* commit '170459f4385d35dd991549e1b545c376ca8df281':
  Update Security String to 2016-01-01 to mnc-dev
2015-11-21 00:48:16 +00:00
Zach Jang 170459f438 Update Security String to 2016-01-01 to mnc-dev
http://b/25819582

Change-Id: Ie55f9476110b08591da05774f582a6e48ce12de7
2015-11-20 22:55:19 +00:00
Zach Jang 58cdbdc5ad Update Security String to 2016-01-01 - DO NOT MERGE
http://b/25819582

Change-Id: I99d8ca004bb5d35613f3a2314597717f6b7c04c7
2015-11-20 22:54:48 +00:00
Bart Sears 550b317688 Revert "Change version back to 6.0"
am: 55a149b740

* commit '55a149b74064b799efe9c69211a511725cb9925b':
  Revert "Change version back to 6.0"
2015-11-15 17:59:44 +00:00
Bart Sears 3a37a0cefd Change version back to 6.0
am: 970f203b3d

* commit '970f203b3d3f17b778749c3ce47eb6b922aa606c':
  Change version back to 6.0
2015-11-15 17:59:32 +00:00
Bart Sears 55a149b740 Revert "Change version back to 6.0"
This reverts commit 970f203b3d.

Change-Id: Icd96990f128e303b0e2af5af0f0d4a0f7731fe60
2015-11-15 17:57:13 +00:00
Bart Sears 970f203b3d Change version back to 6.0
Temporarily set the version back to 6.0 and security patch to
2015-11-01.

Change-Id: Idb09d6bab89362b18ae9657e3ed931d614c1894b
2015-11-14 23:50:18 -08:00
Vince Harron ba740ff57f Switch emulator to generate userdebug images by default
This is primarily to avoid using the unsupported JIT on Android-M

It will increase app install times significantly because the app will
be compiled at install time.  OTOH, It should improve application
performance dramatically.

Change-Id: Id1d637ec561db177fd52e4c111f4def2a1b45543
(cherry picked from commit 08787d747d71d7ff3f13d2275d937faefc6d7777)
2015-11-11 16:32:54 +00:00
Griff Hazen 20ed978ada Let qemu_props service set system properties in ro.emu and ro.emulator
These boot properties are used by android wear emulator to configure
round and chin shaped devices.

Bug: 23324757
Change-Id: I812da02d771bba0ffc63b14459c7de7cbdeed142
2015-11-07 16:44:54 -08:00
Zach Jang eca2b655e5 Merge "Update security string to 2015-12-01" into mnc-dev am: 54cb940c4a
am: dfd3524f7b

* commit 'dfd3524f7b1fb2f0346eee7fa0dc42e8888f68aa':
  Update security string to 2015-12-01
2015-10-27 00:48:30 +00:00
Zach Jang dfd3524f7b Merge "Update security string to 2015-12-01" into mnc-dev
am: 54cb940c4a

* commit '54cb940c4a07701212e96f77ee4a89493b0f251b':
  Update security string to 2015-12-01
2015-10-27 00:44:56 +00:00
Zach Jang 54cb940c4a Merge "Update security string to 2015-12-01" into mnc-dev 2015-10-27 00:37:40 +00:00
Zach Jang a3b35dec78 Update security string to 2015-12-01 - DO NOT MERGE am: 6575d4a2a8 am: cc9ac27157 am: fe64ce145e -s ours am: 0e8cf97670
am: 07e2c19536

* commit '07e2c195367119faa4645d3f9f0dcb1c6aba7396':
  Update security string to 2015-12-01 - DO NOT MERGE
2015-10-26 23:57:13 +00:00
Zach Jang 07e2c19536 Update security string to 2015-12-01 - DO NOT MERGE am: 6575d4a2a8 am: cc9ac27157 am: fe64ce145e -s ours
am: 0e8cf97670

* commit '0e8cf97670c0b0a59d326507296829fe1bc01230':
  Update security string to 2015-12-01 - DO NOT MERGE
2015-10-26 23:52:50 +00:00
Zach Jang 0e8cf97670 Update security string to 2015-12-01 - DO NOT MERGE am: 6575d4a2a8 am: cc9ac27157
am: fe64ce145e  -s ours

* commit 'fe64ce145e243fb3fde5a788bcd800c2987da37c':
  Update security string to 2015-12-01 - DO NOT MERGE
2015-10-26 23:49:22 +00:00