drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
227,980 Commits 1 Branch 0 Tags
Commit Graph

4126 Commits

Author SHA1 Message Date
Casey Dahlin
3dd64c6da5 am 3f7c4bdb: am 449274a7: am 8b25009d: Merge "Revert change to win32 isatty stub" 
* commit '3f7c4bdbc20e005dc55b4bbebd0fd9bdb9e65e7b':
  Revert change to win32 isatty stub
 2015-09-11 03:51:10 +00:00
Casey Dahlin
5f85e1d677 am 6b747f9d: am 3230b2b2: am ec4cbf4f: Merge "Grab macros from libbase instead of duplicating" 
* commit '6b747f9d55d146b37ef4f2de461a4ffc576230a5':
  Grab macros from libbase instead of duplicating
 2015-09-11 03:51:03 +00:00
Casey Dahlin
517214d4a6 am 68a6dcc0: am d880e1cb: am 7e8586fc: Merge "Convert to C++ Bison output" 
* commit '68a6dcc0c15249617b3c8af067b9796bd80e220d':
  Convert to C++ Bison output
 2015-09-11 03:50:55 +00:00
Casey Dahlin
1e3137169e am c48778ee: am 6929b5fa: am c71fdabd: Merge "First pass on reentrant C++-ish parser" 
* commit 'c48778ee31878c3239bbf85c485eac64e5a06b59':
  First pass on reentrant C++-ish parser
 2015-09-11 03:50:25 +00:00
Casey Dahlin
3f7c4bdbc2 am 449274a7: am 8b25009d: Merge "Revert change to win32 isatty stub" 
* commit '449274a774f5c51807f16c13e772550dbd3c5d53':
  Revert change to win32 isatty stub
 2015-09-11 02:51:08 +00:00
Casey Dahlin
6b747f9d55 am 3230b2b2: am ec4cbf4f: Merge "Grab macros from libbase instead of duplicating" 
* commit '3230b2b2b7225fc44515a1650ad79022b959b08e':
  Grab macros from libbase instead of duplicating
 2015-09-11 02:51:01 +00:00
Casey Dahlin
68a6dcc0c1 am d880e1cb: am 7e8586fc: Merge "Convert to C++ Bison output" 
* commit 'd880e1cb0c4fa61328297cae659a7edd94e5ca83':
  Convert to C++ Bison output
 2015-09-11 02:50:55 +00:00
Casey Dahlin
f3c2ed13d0 Revert "Grab macros from libbase instead of duplicating" 
This reverts commit 2535cae005512494469fc5cea1fe630288ecb083.

Change-Id: I373844b6a0f429e88d6bcc1cdd5ac62325da55b3
 2015-09-11 02:47:54 +00:00
Casey Dahlin
449274a774 am 8b25009d: Merge "Revert change to win32 isatty stub" 
* commit '8b25009d92626e7f1bb3b8fdf2774df20ec7a769':
  Revert change to win32 isatty stub
 2015-09-11 02:41:51 +00:00
Casey Dahlin
3230b2b2b7 am ec4cbf4f: Merge "Grab macros from libbase instead of duplicating" 
* commit 'ec4cbf4f93ddb14653c27bfd7a169e010b87286c':
  Grab macros from libbase instead of duplicating
 2015-09-11 02:41:43 +00:00
Casey Dahlin
d880e1cb0c am 7e8586fc: Merge "Convert to C++ Bison output" 
* commit '7e8586fc1e40e7d860b05757882c3617df968fb8':
  Convert to C++ Bison output
 2015-09-11 02:41:35 +00:00
Casey Dahlin
3e50f04dfa Revert change to win32 isatty stub 
This is attempting to fix build breakage caused by redefining the isatty stub
for win32.

Change-Id: I5f854934cb9d2b2981f6349045e85d9ad737aa77
Signed-off-by: Casey Dahlin <sadmac@google.com>
 2015-09-10 19:13:49 -07:00
Casey Dahlin
c48778ee31 am 6929b5fa: am c71fdabd: Merge "First pass on reentrant C++-ish parser" 
* commit '6929b5fab007281d3c35deec905feb8fdc506a31':
  First pass on reentrant C++-ish parser
 2015-09-11 01:55:49 +00:00
Adam Lesinski
09ffc62fdb Merge "AAPT: Don't try to rewrite String constants when loading shared lib" 2015-09-11 01:48:05 +00:00
Casey Dahlin
6929b5fab0 am c71fdabd: Merge "First pass on reentrant C++-ish parser" 
* commit 'c71fdabdd7dc46ef2914ee6fd3ba541689c91844':
  First pass on reentrant C++-ish parser
 2015-09-11 01:47:28 +00:00
Adam Lesinski
eed585821a AAPT: Don't try to rewrite String constants when loading shared lib 
Bug:20138255
Change-Id: Ieb6a31ee9afe0de3d1c99b21f78aa48fe07015c6
 2015-09-10 18:43:34 -07:00
Casey Dahlin
2535cae005 Grab macros from libbase instead of duplicating 
Change-Id: I1802f60a4dac45ddee8cd5715a73c77e4371d7e8
Signed-off-by: Casey Dahlin <sadmac@google.com>
 2015-09-10 18:43:04 -07:00
Casey Dahlin
96786829c2 Convert to C++ Bison output 
We have to step up to a GLR parser to do this without exceptions (for no
reason other than Bison happens to use exceptions for the LALR(1) template and
not for the GLR one), but this should let us smooth out integration going
forward.

Change-Id: Iff44662914b4a65dfa5612d07c3a1ede07e6e4a9
Signed-off-by: Casey Dahlin <sadmac@google.com>
 2015-09-10 18:29:09 -07:00
Casey Dahlin
9941dcc7aa First pass on reentrant C++-ish parser 
We're flipping Flex/Bison in to reentrant mode, cutting down on global
variables, and exposing a more C++-like interface earlier. This is the first
phase. There's still a couple of weird hacks to deal with the previous code's
reckless disregard for scope sanity, but the outline of things to come is
starting to appear, and this CL really doesn't need to get any bigger.

Change-Id: Ife2d70db026d7ab1319bdf6c586959315666d0bb
Signed-off-by: Casey Dahlin <sadmac@google.com>
 2015-09-10 16:55:18 -07:00
Tao Bai
ab5bca1519 Merge "Load app resource as shared library." 2015-09-09 16:08:12 +00:00
Tao Bai
a6d7e3fb9c Load app resource as shared library. 
- Added aapt command line flag --app-as-shared-lib to build app resources
  that could be loaded as shared lib at runtime.
- Added new method AssetManager.addAssetPathAsSharedLibrary() to load an
  app resource as shared library.

Bug 22487604

Change-Id: Ib9b33c35f9c2b7129f3ba205de03d4564623ea39
 2015-09-08 18:48:42 -07:00
Dan Willemsen
33abaca11d am a0c61efa: am 03c26b27: am 596fd38a: Merge "Whitelist windows module" 
* commit 'a0c61efab913bc91f65b427ade0b879c701e5c8f':
  Whitelist windows module
 2015-09-06 23:08:07 +00:00
Dan Willemsen
a0c61efab9 am 03c26b27: am 596fd38a: Merge "Whitelist windows module" 
* commit '03c26b274aed35c0a580b309567264d00cb643f2':
  Whitelist windows module
 2015-09-04 22:00:26 +00:00
Dan Willemsen
03c26b274a am 596fd38a: Merge "Whitelist windows module" 
* commit '596fd38af207727d508a63fca39506c90ba29c44':
  Whitelist windows module
 2015-09-04 21:48:35 +00:00
Dan Willemsen
8d6f9bf3c8 Whitelist windows module 
Bug: 23566667
Change-Id: I030733ffd2b43a0ea74b0fd5f34a0d13ef8dcf7c
 2015-09-04 14:22:17 -07:00
Deepanshu Gupta
44c75820b4 am b3382661: am ee1eed7e: am 7209945f: am 0e150a8b: am 0c5fd7e3: am eb541727: am dd21212f: am eb26f5ce: LayoutLib: Fix typedArray caching. 
* commit 'b3382661eb3af61815812bd762ac1fcc2f5d9ef5':
  LayoutLib: Fix typedArray caching.
 2015-09-03 05:03:04 +00:00
Deepanshu Gupta
b3382661eb am ee1eed7e: am 7209945f: am 0e150a8b: am 0c5fd7e3: am eb541727: am dd21212f: am eb26f5ce: LayoutLib: Fix typedArray caching. 
* commit 'ee1eed7e711228008dc91a7da800be6527539e87':
  LayoutLib: Fix typedArray caching.
 2015-09-03 04:24:04 +00:00
Christopher Wiley
f81a3de3a2 am 0ba44aaa: am 80a679c4: am b1db04f3: Merge "aidl: Add end to end test" 
* commit '0ba44aaa7385f1d9151e59a7ce016a3fd37d9e87':
  aidl: Add end to end test
 2015-09-03 00:55:25 +00:00
Christopher Wiley
d25bba39d9 am c9c24467: am a3b4fb68: am b14e7b84: Merge "aidl: Remove example test" 
* commit 'c9c24467735425f3ae83e88e1f024fbf34545495':
  aidl: Remove example test
 2015-09-03 00:55:18 +00:00
Christopher Wiley
0ba44aaa73 am 80a679c4: am b1db04f3: Merge "aidl: Add end to end test" 
* commit '80a679c459d509e31f0f4e1b8accc327a451e0f5':
  aidl: Add end to end test
 2015-09-03 00:39:29 +00:00
Christopher Wiley
c9c2446773 am a3b4fb68: am b14e7b84: Merge "aidl: Remove example test" 
* commit 'a3b4fb6851dc91222863783b7ac6664d62df2c3d':
  aidl: Remove example test
 2015-09-03 00:39:22 +00:00
Christopher Wiley
80a679c459 am b1db04f3: Merge "aidl: Add end to end test" 
* commit 'b1db04f371963cb61bc5df21142a59f77515a62f':
  aidl: Add end to end test
 2015-09-03 00:31:52 +00:00
Christopher Wiley
a3b4fb6851 am b14e7b84: Merge "aidl: Remove example test" 
* commit 'b14e7b84290fa40221e3f315862dd1f79bf21871':
  aidl: Remove example test
 2015-09-03 00:31:45 +00:00
Casey Dahlin
626ba0c263 am 1be040fb: am b15623cf: resolved conflicts for merge of 9483748a to stage-aosp-master 
* commit '1be040fb7d849762bf31bf9f898a4a004015aeb1':
  Delete outdated options tests
 2015-09-02 23:29:19 +00:00
Casey Dahlin
1be040fb7d am b15623cf: resolved conflicts for merge of 9483748a to stage-aosp-master 
* commit 'b15623cf1c63d33fdd60c6046312c88cda961eb6':
  Delete outdated options tests
 2015-09-02 23:20:40 +00:00
Casey Dahlin
b5ba8204ad am 1ef20d62: am bad130ee: am 02bc5488: Merge "Remove RPC interface Type" 
* commit '1ef20d6221b7d752e636653df7798f6f4fb5ff06':
  Remove RPC interface Type
 2015-09-02 21:46:53 +00:00
Casey Dahlin
b15623cf1c resolved conflicts for merge of 9483748a to stage-aosp-master 
Change-Id: I82fd3a6ddeffc564915e43b23b81293adf1f9b5d
 2015-09-02 14:33:41 -07:00
Casey Dahlin
1ef20d6221 am bad130ee: am 02bc5488: Merge "Remove RPC interface Type" 
* commit 'bad130eed378891b82250d90aaf207088b4362e2':
  Remove RPC interface Type
 2015-09-02 21:29:59 +00:00
Casey Dahlin
bad130eed3 am 02bc5488: Merge "Remove RPC interface Type" 
* commit '02bc5488c19dcae7f21c43c8f3a20138e01a04d9':
  Remove RPC interface Type
 2015-09-02 21:18:46 +00:00
Christopher Wiley
b1db04f371 Merge "aidl: Add end to end test" 2015-09-02 21:10:30 +00:00
Christopher Wiley
b14e7b8429 Merge "aidl: Remove example test" 2015-09-02 21:10:09 +00:00
Casey Dahlin
d6b6b80cdb Delete outdated options tests 
Bug: 23718807
Test: Re-ran make. Confirmed code was not linked.
Change-Id: If065b9287ed70b9e380281cae42f89bd5f1ffb06
Signed-off-by: Casey Dahlin <sadmac@google.com>
 2015-09-02 13:34:26 -07:00
Casey Dahlin
ca4543cdba Remove RPC interface Type 
AIDL previously supported "rpc" and "flatten" types, which are not used
anywhere in the Android tree. This patch removes them, which significantly cuts
down code and complexity.

Bug: 23517584
Test: Rebuilt AOSP tree against new version
Change-Id: I6cf38d43c1ce109ffca987cc14520945aa22431f
Signed-off-by: Casey Dahlin <sadmac@google.com>
 2015-09-02 13:34:26 -07:00
Christopher Wiley
5ed76073a4 aidl: Add end to end test 
This test sets up an artificial hierarchy of .aidl files, then
checks that the generated code contains a substring that we
know to be correct.  This isn't a very good unittest, but it does
validate that the whole flow works start to finish.

Bug: 23516947
Test: compiles, unit tests pass.

Change-Id: I931b7659731b05440040623e12596669604cef3a
 2015-09-02 13:00:09 -07:00
Christopher Wiley
6d57207f37 aidl: Remove example test 
We have enough tests demonstrating how to write them.

Bug: 23516947
Change-Id: I966cb6bb2d754db389be8f9b90957ac33cf66639
Test: Unittests pass.
 2015-09-02 12:55:07 -07:00
Christopher Wiley
a2a3acbb27 am 1ed4f0f1: am d494b8c0: am f37947cb: Merge "aidl: Don\'t link librt on Mac" 
* commit '1ed4f0f1080246dfee6df22221bb863b46c8ff7e':
  aidl: Don't link librt on Mac
 2015-09-02 16:53:59 +00:00
Christopher Wiley
1ed4f0f108 am d494b8c0: am f37947cb: Merge "aidl: Don\'t link librt on Mac" 
* commit 'd494b8c0cfaeedfb560f09355254c5fe397242be':
  aidl: Don't link librt on Mac
 2015-09-02 16:43:08 +00:00
Christopher Wiley
d494b8c0cf am f37947cb: Merge "aidl: Don\'t link librt on Mac" 
* commit 'f37947cb1a452b81f7b25cf961763c2ec3db5632':
  aidl: Don't link librt on Mac
 2015-09-02 16:34:40 +00:00
Christopher Wiley
1ab54c12e3 aidl: Don't link librt on Mac 
This fixes unittest build on Mac.

Change-Id: I5180f647d1b5b41f99c4d0423aaec9d05fee6355
 2015-09-02 08:59:30 -07:00
Deepanshu Gupta
ee1eed7e71 am 7209945f: am 0e150a8b: am 0c5fd7e3: am eb541727: am dd21212f: am eb26f5ce: LayoutLib: Fix typedArray caching. 
* commit '7209945fd38d22078b2fd208abe0aa976c311dde':
  LayoutLib: Fix typedArray caching.
 2015-09-02 01:21:26 +00:00