Commit graph

34610 commits

Author SHA1 Message Date
bohu
390e1720a7 emulator: fingerprint: switch to using fingerprint HIDL interface
BUG: 34387576
Change-Id: Ia203ee1540f5c7c80e17d7a17abd3ce126579551
2017-01-18 12:23:39 -08:00
Jean-Luc Brouillet
8471aa9d46 Merge "Move rs/scriptc to rs/script_api/include." am: a3ab4cc9c9 am: d9bfeff242 am: 235123a821
am: 128cebe6fe

Change-Id: I701bc6cb7cadb16d770b77e4a161994de278e142
2017-01-11 02:27:31 +00:00
Jean-Luc Brouillet
128cebe6fe Merge "Move rs/scriptc to rs/script_api/include." am: a3ab4cc9c9 am: d9bfeff242
am: 235123a821

Change-Id: I48ec15a00e4cbc0714d1eb93e73c933e5e531cad
2017-01-11 02:22:59 +00:00
Jean-Luc Brouillet
235123a821 Merge "Move rs/scriptc to rs/script_api/include." am: a3ab4cc9c9
am: d9bfeff242

Change-Id: I0249452861ffd748200c02434674832a2303b20b
2017-01-11 02:17:59 +00:00
Jean-Luc Brouillet
d9bfeff242 Merge "Move rs/scriptc to rs/script_api/include."
am: a3ab4cc9c9

Change-Id: Iddbffd165df0bb1587fb534084014ced46fb529b
2017-01-11 02:12:58 +00:00
Jean-Luc Brouillet
a3ab4cc9c9 Merge "Move rs/scriptc to rs/script_api/include." 2017-01-11 02:04:16 +00:00
Weilun Du
0499d282a7 Merge "Allow /dev/goldfish_sync" 2017-01-10 19:32:23 +00:00
TreeHugger Robot
e6b8475baf Merge "Storaged build file" 2017-01-09 21:55:49 +00:00
Steven Moreland
3ac4a22f77 Merge "embedded.mk: add android.hidl.memory@1.0-impl" am: 2ec742a956 am: ff2c0a1433 am: d1f4fc175e
am: 9db3e06696

Change-Id: Ie29c0bf8b763ea954653b7d33d78d82bc7bbfc3e
2017-01-09 21:16:44 +00:00
Steven Moreland
9db3e06696 Merge "embedded.mk: add android.hidl.memory@1.0-impl" am: 2ec742a956 am: ff2c0a1433
am: d1f4fc175e

Change-Id: Iab6fc57fe86ecefbaf2f55f3bea5542db880f83a
2017-01-09 21:07:06 +00:00
Steven Moreland
d1f4fc175e Merge "embedded.mk: add android.hidl.memory@1.0-impl" am: 2ec742a956
am: ff2c0a1433

Change-Id: I28e67e22a3fd5322a17a4ad2ee32f2b0fd0a0f70
2017-01-09 21:02:06 +00:00
Steven Moreland
ff2c0a1433 Merge "embedded.mk: add android.hidl.memory@1.0-impl"
am: 2ec742a956

Change-Id: Ifa7263257caf2198b5980b30f0efbfd129771e30
2017-01-09 20:57:36 +00:00
Dan Cashman
a422ed126b Merge "Split seapp_contexts into plat and nonplat components." am: 082e8e07ac am: a44337de33 am: 7a160eb5c8
am: 16232c300d

Change-Id: I1141e7a1ded995948e8478263fc3b385ba4f2f8c
2017-01-09 20:52:55 +00:00
Dan Cashman
40aabca6f2 Split seapp_contexts into plat and nonplat components. am: 6f1ea7101f am: c6321e54b6 am: 1960e5f085
am: a4d44e3d4c

Change-Id: I4f078f5767c23a9459cb03f9ac12cb4631fe8ec0
2017-01-09 20:52:48 +00:00
Treehugger Robot
2ec742a956 Merge "embedded.mk: add android.hidl.memory@1.0-impl" 2017-01-09 20:51:16 +00:00
Dan Cashman
16232c300d Merge "Split seapp_contexts into plat and nonplat components." am: 082e8e07ac am: a44337de33
am: 7a160eb5c8

Change-Id: I92a2abfbb1b3381bd9c4db8cf267d33c56b3e748
2017-01-09 20:47:54 +00:00
Dan Cashman
a4d44e3d4c Split seapp_contexts into plat and nonplat components. am: 6f1ea7101f am: c6321e54b6
am: 1960e5f085

Change-Id: I8f89ecb6d46877871c4686b7cdfc1548317c00f2
2017-01-09 20:47:47 +00:00
Dan Cashman
7a160eb5c8 Merge "Split seapp_contexts into plat and nonplat components." am: 082e8e07ac
am: a44337de33

Change-Id: I98a149f6609739986b52e594075c72b0cebd2c00
2017-01-09 20:42:55 +00:00
Dan Cashman
1960e5f085 Split seapp_contexts into plat and nonplat components. am: 6f1ea7101f
am: c6321e54b6

Change-Id: I8548f258416b730625d332e461b16df5b27c5c9a
2017-01-09 20:42:47 +00:00
Dan Cashman
a44337de33 Merge "Split seapp_contexts into plat and nonplat components."
am: 082e8e07ac

Change-Id: Id18ea3cafe444dc8574fd9ac0970f66dc0dad1aa
2017-01-09 20:38:07 +00:00
Dan Cashman
c6321e54b6 Split seapp_contexts into plat and nonplat components.
am: 6f1ea7101f

Change-Id: If495c16b0259134492ba6f912a4d54c90fedc468
2017-01-09 20:37:46 +00:00
Treehugger Robot
082e8e07ac Merge "Split seapp_contexts into plat and nonplat components." 2017-01-09 20:30:22 +00:00
Tao Bao
5f3ca656f4 Merge "Makefile: Pack e2fsdroid into otatools.zip." am: bb6935051a am: ca95ee0465 am: da855a7081
am: ead0949984

Change-Id: Icb654857182970b91ec046ed2a20da3aa70e98aa
2017-01-09 19:46:18 +00:00
Tao Bao
196488acc8 Makefile: Pack e2fsdroid into otatools.zip. am: bcc3109262 am: 8c07d3c840 am: f2305870f0
am: 3d78cbf07b

Change-Id: I4bc414a6d2c36fc449507658b1bb40938cee6624
2017-01-09 19:46:02 +00:00
Tao Bao
ead0949984 Merge "Makefile: Pack e2fsdroid into otatools.zip." am: bb6935051a am: ca95ee0465
am: da855a7081

Change-Id: I82755a18d863ae3cb6b0a8fb4542ded3f5b8e08b
2017-01-09 19:37:15 +00:00
Tao Bao
3d78cbf07b Makefile: Pack e2fsdroid into otatools.zip. am: bcc3109262 am: 8c07d3c840
am: f2305870f0

Change-Id: I5cb4fdbed689a5635340e751ee08ef606cfbb771
2017-01-09 19:37:01 +00:00
ynwang
226d674624 Storaged build file
Add storaged to embedded.mk to be built.

Bug: 30983988

Change-Id: I157bc09bfe188423681e1b70b4d39ae212b7567e
2017-01-09 11:36:17 -08:00
Tao Bao
da855a7081 Merge "Makefile: Pack e2fsdroid into otatools.zip." am: bb6935051a
am: ca95ee0465

Change-Id: I3258e0fd12a859fdf307b854fe0a1af6cc0250c0
2017-01-09 19:32:44 +00:00
Tao Bao
f2305870f0 Makefile: Pack e2fsdroid into otatools.zip. am: bcc3109262
am: 8c07d3c840

Change-Id: I618f192b092feef99f430b65a4463c925e382d1b
2017-01-09 19:32:30 +00:00
Tao Bao
ca95ee0465 Merge "Makefile: Pack e2fsdroid into otatools.zip."
am: bb6935051a

Change-Id: Id514131231d4f5123322e4d9e0c0f797198cb275
2017-01-09 19:27:01 +00:00
Tao Bao
8c07d3c840 Makefile: Pack e2fsdroid into otatools.zip.
am: bcc3109262

Change-Id: I32ef5db01b70420994f48fe35a8eb4ba071eb4be
2017-01-09 19:27:00 +00:00
Tao Bao
bb6935051a Merge "Makefile: Pack e2fsdroid into otatools.zip." 2017-01-09 19:17:21 +00:00
Jean-Luc Brouillet
eba449391e Move rs/scriptc to rs/script_api/include.
Test: Compiled ImageProcessing_jb

Change-Id: Icf05a603671499665d2f31a8989fa69585a6f834
2017-01-08 17:57:48 -08:00
Steven Moreland
94946d0eb8 embedded.mk: add android.hidl.memory@1.0-impl
Bug: 34134179
Test: both 32 and 64 bit versions of this file are on the device after a
clean build.

Change-Id: I75ab12246c2c44e39b5e863dfec98dc72a36fbbe
2017-01-08 10:00:20 -08:00
Tao Bao
bcc3109262 Makefile: Pack e2fsdroid into otatools.zip.
e2fsdroid is needed to create ext4 images with mke2fs. Also pack both
sets of mke2fs and make_ext4fs tools into otatools.zip. Because we use
the latest otatools.zip to create OTAs, which needs to handle
target_files.zip using either of them.

Bug: 34126605
Test: `m otatools-package` and check it has e2fsdroid and make_ext4fs.
Test: Use otatools.zip to sign a TF.zip that defines
      TARGET_USES_MKE2FS={true,false}.

Change-Id: I9967e4f078cbe912914c6c511681cba82356ae8e
2017-01-06 14:32:51 -08:00
Lingfeng Yang
ee3bd46245 Merge "Allow goldfish-setup to take wake locks" am: 10f6bf093d am: 528a561d4e am: f0069a0c7f
am: f5bb5b739a

Change-Id: I46f1077c114e1e7f972dc1823277d66b01348424
2017-01-06 20:18:51 +00:00
Lingfeng Yang
f5bb5b739a Merge "Allow goldfish-setup to take wake locks" am: 10f6bf093d am: 528a561d4e
am: f0069a0c7f

Change-Id: Iff439685a59151844915828ec952880c2843e051
2017-01-06 20:11:19 +00:00
Lingfeng Yang
f0069a0c7f Merge "Allow goldfish-setup to take wake locks" am: 10f6bf093d
am: 528a561d4e

Change-Id: I94dc950a2401967c1688290762fea8df0fab96ed
2017-01-06 20:07:19 +00:00
Lingfeng Yang
528a561d4e Merge "Allow goldfish-setup to take wake locks"
am: 10f6bf093d

Change-Id: I0c6100a314ea619d91b1b4a2c82894b102cdaaea
2017-01-06 20:03:48 +00:00
Treehugger Robot
10f6bf093d Merge "Allow goldfish-setup to take wake locks" 2017-01-06 19:57:53 +00:00
Patrick Tjin
0849337805 build_image: add support for specifying number of inodes [DO NOT MERGE] am: 37a73e0f09 -s ours
am: 1cfc60a989  -s ours

Change-Id: I17e9ba205888fcbb691813f134d8ced8f1b6a1fa
2017-01-06 18:35:23 +00:00
Patrick Tjin
1cfc60a989 build_image: add support for specifying number of inodes [DO NOT MERGE]
am: 37a73e0f09  -s ours

Change-Id: Ibbd39ba62b40b34b0d3c74c356d4047019e2c491
2017-01-06 18:31:48 +00:00
Lingfeng Yang
de0eaf2b7b Allow goldfish-setup to take wake locks
Change-Id: I6a5db8586168e47e974a82afd2e75fd858aa5750
2017-01-06 10:12:08 -08:00
dcashman
443f5e9e2f Merge "Build split file_contexts." am: 80e70ae04a am: dc9771e24c am: 9937a72425
am: a22bbc4bfb

Change-Id: I674242185e929ab3f381c1681414730cef4250f1
2017-01-06 17:41:12 +00:00
dcashman
a22bbc4bfb Merge "Build split file_contexts." am: 80e70ae04a am: dc9771e24c
am: 9937a72425

Change-Id: I72996355a0b77ac3b40361d214b7ce9b4f3778b4
2017-01-06 17:37:13 +00:00
dcashman
9937a72425 Merge "Build split file_contexts." am: 80e70ae04a
am: dc9771e24c

Change-Id: Iff2afa4574052a4580739ce04904401334d1c270
2017-01-06 17:33:14 +00:00
dcashman
dc9771e24c Merge "Build split file_contexts."
am: 80e70ae04a

Change-Id: I2445d8e3e5f205cf3761fcf1ea12af007bbed0d9
2017-01-06 17:29:10 +00:00
Treehugger Robot
80e70ae04a Merge "Build split file_contexts." 2017-01-06 17:23:45 +00:00
Dan Willemsen
b1be1db324 Merge "TARGET_RECOVERY_UPDATER_LIBS should not be used with AB updates" am: 81648927fb am: ce324c6848 am: cb43c0f8db
am: c1e617618e

Change-Id: I263bce77a6e52925f356344dfee437c6379d7e82
2017-01-05 22:58:45 +00:00
Dan Willemsen
c1e617618e Merge "TARGET_RECOVERY_UPDATER_LIBS should not be used with AB updates" am: 81648927fb am: ce324c6848
am: cb43c0f8db

Change-Id: I3789913b087288d31738f51668c79a502c3e3745
2017-01-05 22:55:13 +00:00