Commit Graph

17583 Commits

Author SHA1 Message Date
Dirk Dougherty 5772ce6130 Sync master templates with upstream branch, retain annotation customization from master.
Change-Id: Ie1119bc1b18a017e1bef199949801fb045d8ff06
2014-05-14 15:04:40 -07:00
Dirk Dougherty efb9987de6 am 8fdd4a0b: am 7db3e8a5: am 9890fe24: am c3921656: Add templates support for dynamic content and sticky nav bar.
* commit '8fdd4a0b567878c5cf0aaa9f24496f5888239fea':
  Add templates support for dynamic content and sticky nav bar.
2014-05-14 21:09:39 +00:00
Sreeram Ramachandran 4ed4585cd8 am d8615113: am 6af650d6: am da492d7e: Merge "Introduce netd_client, a dynamic library that talks to netd."
* commit 'd86151135a83df029edbf53c88c2713eb35b9cf3':
  Introduce netd_client, a dynamic library that talks to netd.
2014-05-14 21:05:29 +00:00
Dirk Dougherty 8fdd4a0b56 am 7db3e8a5: am 9890fe24: am c3921656: Add templates support for dynamic content and sticky nav bar.
* commit '7db3e8a518ee51ba1a511948de71675e3457ff13':
  Add templates support for dynamic content and sticky nav bar.
2014-05-14 21:02:39 +00:00
Dirk Dougherty 7db3e8a518 am 9890fe24: am c3921656: Add templates support for dynamic content and sticky nav bar.
* commit '9890fe24f1451d0393337904852d0ca24808c2bc':
  Add templates support for dynamic content and sticky nav bar.
2014-05-14 20:56:51 +00:00
Dirk Dougherty 9890fe24f1 am c3921656: Add templates support for dynamic content and sticky nav bar.
* commit 'c3921656f544af2fac99c3fab9ea5139150d45a2':
  Add templates support for dynamic content and sticky nav bar.
2014-05-14 20:53:13 +00:00
Sreeram Ramachandran d86151135a am 6af650d6: am da492d7e: Merge "Introduce netd_client, a dynamic library that talks to netd."
* commit '6af650d6e3d1a2d4e728151c7698c6d5ea906b59':
  Introduce netd_client, a dynamic library that talks to netd.
2014-05-14 19:51:41 +00:00
Sreeram Ramachandran 6af650d6e3 am da492d7e: Merge "Introduce netd_client, a dynamic library that talks to netd."
* commit 'da492d7ed029b721bef02ca02d98148d5d9f4b3d':
  Introduce netd_client, a dynamic library that talks to netd.
2014-05-14 19:48:13 +00:00
Kenny Root 4884f8738d am d36d61be: am abe42666: Move libkeystore to minimal
* commit 'd36d61bec8d728088a300a392b9815555a0203d4':
  Move libkeystore to minimal
2014-05-14 19:46:07 +00:00
Sreeram Ramachandran da492d7ed0 Merge "Introduce netd_client, a dynamic library that talks to netd." 2014-05-14 19:42:41 +00:00
Kenny Root d36d61bec8 am abe42666: Move libkeystore to minimal
* commit 'abe426663a0534db685f2d44b8cd9a47480fb52f':
  Move libkeystore to minimal
2014-05-14 19:40:53 +00:00
Dirk Dougherty c3921656f5 Add templates support for dynamic content and sticky nav bar.
Change-Id: Icb4e492a991a19e3e1eac72eafc83623b00be5de
2014-05-14 12:00:34 -07:00
Kenny Root abe426663a Move libkeystore to minimal
The ENGINE needs to be included to make the keystore useful, so if
keystore is included, also include libkeystore.

Change-Id: I042a4eb02450d090f10437deb736e1c4a4105df7
2014-05-14 11:50:35 -07:00
Sreeram Ramachandran a280216494 Introduce netd_client, a dynamic library that talks to netd.
(cherry picked from commit 440de6b9f715cb18b8ee888c58d5c7a659ff5073)

Change-Id: Ib6198e19dbc306521a26fcecfdf6e8424d163fc9
2014-05-14 11:21:01 -07:00
Sreeram Ramachandran 61fa8d83e3 Introduce netd_client, a dynamic library that talks to netd.
(cherry picked from commit 440de6b9f715cb18b8ee888c58d5c7a659ff5073)

Change-Id: Ib6198e19dbc306521a26fcecfdf6e8424d163fc9
2014-05-14 15:59:05 +00:00
Geremy Condra abf1aa5305 Merge "Reopen temporary system image to avoid stale data." 2014-05-14 04:37:56 +00:00
Geremy Condra 15d5348e6c Reopen temporary system image to avoid stale data.
NamedTemporaryFile's aggressive caching behavior can cause an issue
where changes made by another process aren't visible even after the
fseek() below or a flush(). To avoid this, simply open the file
again and read from the fresh version.

This fixes an issue where verity metadata written by append2simg
doesn't become visible to img_from_target_files.

Change-Id: I291fb3a95d5b532218ac6205ecc9e9b4f3a36bd4
2014-05-13 20:23:54 -07:00
Doug Zongker 9843fd8489 add missing verity tools to otatools target
Change-Id: I856e43ac9757cf082548646e50db8bbc8da71d0a
2014-05-13 14:18:47 -07:00
Ying Wang 2ec7c7a21c am 5c7c9887: am 03d02a26: am b082b5f1: Merge "Disable DEXPREOPT until we have multilib support"
* commit '5c7c9887f4216dbd94cc40451b3e4cc3dfd5a441':
  Disable DEXPREOPT until we have multilib support
2014-05-13 17:06:01 +00:00
Ying Wang 5c7c9887f4 am 03d02a26: am b082b5f1: Merge "Disable DEXPREOPT until we have multilib support"
* commit '03d02a2687cbd59b8871ccbe0eeb3c2c51df063c':
  Disable DEXPREOPT until we have multilib support
2014-05-13 16:58:47 +00:00
Ying Wang 03d02a2687 am b082b5f1: Merge "Disable DEXPREOPT until we have multilib support"
* commit 'b082b5f1b2d1a45ee91de186428d5e341d02c08a':
  Disable DEXPREOPT until we have multilib support
2014-05-13 16:54:29 +00:00
Ying Wang b082b5f1b2 Merge "Disable DEXPREOPT until we have multilib support" 2014-05-13 16:49:32 +00:00
Ying Wang a93102d411 Disable DEXPREOPT until we have multilib support
Bug: 14694978
Change-Id: I31d0f1c78a668435646c99e659cec46cd2f3ddf7
2014-05-13 09:46:23 -07:00
Ying Wang 03ff5c3a58 am 37aacb8a: am 72344a73: am 8012d8f3: Merge "Treat denver like cortex-a15."
* commit '37aacb8a31970197fb62aab3e5978e3bb4b0709b':
  Treat denver like cortex-a15.
2014-05-13 16:43:46 +00:00
Ying Wang 37aacb8a31 am 72344a73: am 8012d8f3: Merge "Treat denver like cortex-a15."
* commit '72344a7329ab984de716b630cb88039d9ed820a0':
  Treat denver like cortex-a15.
2014-05-13 16:38:47 +00:00
Ying Wang 72344a7329 am 8012d8f3: Merge "Treat denver like cortex-a15."
* commit '8012d8f353304ef4487545648455d34d6ffc2741':
  Treat denver like cortex-a15.
2014-05-13 16:34:00 +00:00
Ying Wang 8012d8f353 Merge "Treat denver like cortex-a15." 2014-05-13 16:28:10 +00:00
Ying Wang fb910ddb1d Treat denver like cortex-a15.
See also build/core/combo/arch/arm/armv7-a-neon.mk.

Change-Id: Ie18e1f133f56a9f7da80e304052c92edad933a31
2014-05-13 09:02:56 -07:00
Andrew Hsieh 65c5313605 am f6566fd1: am e7b99aec: am fb1f38ec: Merge "Define __USE_MINGW_ANSI_STDIO for windows build"
* commit 'f6566fd1f96275f6daec46ced8ceba25c87aedaa':
  Define __USE_MINGW_ANSI_STDIO for windows build
2014-05-13 01:02:56 +00:00
Andrew Hsieh f6566fd1f9 am e7b99aec: am fb1f38ec: Merge "Define __USE_MINGW_ANSI_STDIO for windows build"
* commit 'e7b99aec678426bdd19548c9f62cd3694c51702c':
  Define __USE_MINGW_ANSI_STDIO for windows build
2014-05-13 00:59:28 +00:00
Andrew Hsieh e7b99aec67 am fb1f38ec: Merge "Define __USE_MINGW_ANSI_STDIO for windows build"
* commit 'fb1f38ecbacfb5dc2cc4f3f83eb814ac2aa090ca':
  Define __USE_MINGW_ANSI_STDIO for windows build
2014-05-13 00:57:08 +00:00
Andrew Hsieh fb1f38ecba Merge "Define __USE_MINGW_ANSI_STDIO for windows build" 2014-05-13 00:53:45 +00:00
Adam Lesinski 404d21450a am 17a4a0bd: am 9bbbac75: Merge "Change aapt flag to use new name"
* commit '17a4a0bd410f6133fd9088828f27e598ec9d268b':
2014-05-12 23:31:29 +00:00
Ying Wang 48ea32b2bf am b45c9108: am b80e229d: am 66f2af4e: am 6c432940: am dcdc985c: Merge "executable_prefer_symlink: add makefile for creating symlink to prefer version"
* commit 'b45c910850640ed7ffcd0f6744992ca7dc335c2c':
2014-05-12 23:31:28 +00:00
Geremy Condra f3c1b1460a am 27b95314: am c10320ee: Merge "Add verity support to `make dist`."
* commit '27b95314a0d9e49b02615a48f6805a0cb6a88af3':
2014-05-12 23:31:28 +00:00
David 'Digit' Turner 8ccc5ba19b am fc4e2bc5: am edc702c7: am 873782cc: am 9e3259f5: am fb67f05d: Merge changes I53b2ada9,I30794ea5
* commit 'fc4e2bc5023f26cae2b6c209c5880956d548d046':
2014-05-12 23:31:27 +00:00
Scott Main 5de9137377 am a4cb2d99: am bd58064a: am 17b3567b: am e4af3b35: am 18ba007b: am 7a6ab434: update wear header template to support sticky nav. moved the search and menu markup for the header into a method call. also update the styles and script so that when a page does not belong t
* commit 'a4cb2d99a341af8027c8194aadcfd5c1dd7b0933':
2014-05-12 23:31:26 +00:00
Michael Runge 2bccbe93c4 am 48c49a58: am 4f12fcee: Add missing quotation mark in assertion
* commit '48c49a5818feba22b531f88a102e629a4bd13d4c':
2014-05-12 23:31:25 +00:00
Doug Zongker 8fd66d8715 am 93e656c7: am 91a99c28: fix ota script to generate non-block commands correctly
* commit '93e656c754b29a8f1568000a6fb27187e880fb0f':
2014-05-12 23:31:25 +00:00
Doug Zongker 756d630846 am 633c7ee8: am 1aebed36: Merge "assert recovery finger/thumbprints, not system"
* commit '633c7ee8804003c93f6caae38a526c98fc0f9094':
2014-05-12 23:31:24 +00:00
Andrew Hsieh 4298097e3f am 4517d30c: am 9604c068: am a01cb054: am c581e10a: am eca0043b: Merge "Disable canonical prefixes of system headers"
* commit '4517d30cb46200334da5ade23a80a23b6d1793da':
2014-05-12 23:31:23 +00:00
Ying Wang 07704af345 am 4e642c1a: am 38e49504: am 96e487b2: am 98892291: am 3afc688a: Merge "javac: rename common_flags to avoid conflictions"
* commit '4e642c1aca7a7162ac95475e3d348259128fc205':
2014-05-12 23:31:22 +00:00
Ed Heyl 05984102db am 6d42eda2: am 0cd5ec5b: Merge "Fix build: Revert "Add verity support to `make dist`.""
* commit '6d42eda2315dfce59e3a64eb938b85fefe3c2107':
2014-05-12 23:31:21 +00:00
Xavier Ducrohet 21ac7be215 am edd798af: am 7b967dc1: am a6a2969e: Resolved conflicts for merge of 05a7a955 to klp-modular-dev-plus-aosp
* commit 'edd798affc20203b4be16920f85c6bee05e4a0db':
2014-05-12 23:31:20 +00:00
Geremy Condra fa229c6f93 am 8fdd619c: am c921b1eb: Merge "Add verity support to `make dist`."
* commit '8fdd619c2ef5bf72ec2c573c7c7ac7feb6162aa6':
2014-05-12 23:31:20 +00:00
Ying Wang 8e980f166e am d875bf03: am e55c2517: am af3f1a54: am d6214b31: am 0d4b3df6: Merge "Target "tests" now only builds the modules tagged as "tests""
* commit 'd875bf03094a93cc6673d0b069a7eaf81b3f8a8a':
2014-05-12 23:31:19 +00:00
Ying Wang f462f1bba7 am 2bf2db5f: am 82d64345: am 1ba08f6b: (-s ours) am 2d41656c: am f6603f75: Merge "Add tool to package up built modules."
* commit '2bf2db5f19956f618a3cb0ee1eda3ac6de87e906':
2014-05-12 23:31:18 +00:00
Ying Wang e9b6bee9a5 am 2665dc6b: am 151c5060: Merge "Target "tests" now only builds the modules tagged as "tests""
* commit '2665dc6b4b4afd7ffbcfea7878302837e1d31e93':
2014-05-12 23:31:17 +00:00
Tsu Chiang Chuang ce78a9a01c am 9da3a746: am 7e9d23d9: am c0d50f62: am 5bd1da1e: am 41d8760d: Merge "Bump userdata image size from 200 MB to 550 MB"
* commit '9da3a74649a40797c280a1d7a2a05e0886adca51':
2014-05-12 23:31:16 +00:00
Brian Carlstrom 595f09b65a am 68065b37: am 0e183b2d: am 676c8f04: am 4ed19f0f: am 1e63c2d1: Merge "Add dalvik.vm.dex2oat-flags for eng build"
* commit '68065b37457de0c22cd9378297e6ff85818a19d9':
2014-05-12 23:31:15 +00:00