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

3872 Commits

Author SHA1 Message Date
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
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
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
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
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
Deepanshu Gupta
0c5fd7e379 am eb541727: am dd21212f: am eb26f5ce: LayoutLib: Fix typedArray caching. 
* commit 'eb54172719db60740a0b8dde6380db54d4006159':
  LayoutLib: Fix typedArray caching.
 2015-09-02 00:11:24 +00:00
Deepanshu Gupta
eb54172719 am dd21212f: am eb26f5ce: LayoutLib: Fix typedArray caching. 
* commit 'dd21212fa1a9c907d5d2f80f3de2413f6c14da7a':
  LayoutLib: Fix typedArray caching.
 2015-09-01 23:59:10 +00:00
Deepanshu Gupta
eb26f5cecd LayoutLib: Fix typedArray caching. 
The typedArray depends on the current context (more specifically, the
themes set on the context). The fact was ignored in the caching of the
typedArray and caused the android:theme attribute to be ignored in
certain cases.

Change-Id: If095580919474f12c0eb4e1f8fb7f076cf3c4ed0
 2015-09-01 23:17:56 +00:00
Christopher Wiley
082fb1d8cb am 96343073: am dd80a6cf: Merge "aidl: Stop using Bionic\'s test main" 
* commit '96343073d63c72afa75057129abea4f0d4f8c103':
  aidl: Stop using Bionic's test main
 2015-09-01 20:11:55 +00:00
Christopher Wiley
96343073d6 am dd80a6cf: Merge "aidl: Stop using Bionic\'s test main" 
* commit 'dd80a6cf37799b41ae07c60137d312c5ea2db961':
  aidl: Stop using Bionic's test main
 2015-09-01 20:01:30 +00:00
Christopher Wiley
1006bfe09d aidl: Stop using Bionic's test main 
This allows us to build unittests on Mac, where Bionic's test main
does not build.

Change-Id: I59c805d233498bb67575f2e5f7049341f70ce55c
 2015-09-01 12:40:15 -07:00
Christopher Wiley
59b41c6418 am c8e4af65: am 722bf5c7: Merge "aidl: Separate aidl logic into its own static library" 
* commit 'c8e4af65af7990d45e5505ebedc832c0a8fe58aa':
  aidl: Separate aidl logic into its own static library
 2015-09-01 19:00:53 +00:00
Christopher Wiley
c8e4af65af am 722bf5c7: Merge "aidl: Separate aidl logic into its own static library" 
* commit '722bf5c7dec37265021c17d35b0b078776699f97':
  aidl: Separate aidl logic into its own static library
 2015-09-01 18:49:12 +00:00
Christopher Wiley
f3d846d0bd am cf471647: am 267cb88f: Merge "Set up aidl for gtest" 
* commit 'cf4716473d5af3cd257b7e093c95c9b63b3b32c9':
  Set up aidl for gtest
 2015-09-01 18:31:11 +00:00
Christopher Wiley
cf4716473d am 267cb88f: Merge "Set up aidl for gtest" 
* commit '267cb88f4d4adb2cdddd9b29eb8fce7104507114':
  Set up aidl for gtest
 2015-09-01 18:20:19 +00:00
Christopher Wiley
a25d35106e aidl: Separate aidl logic into its own static library 
Compile aidl's logic into a static library that can be
linked against both the unittest binary and the executable. Validate
that this is working by writing a basic unittest against options
parsing.

Provide default values for Options struct members.  These were
previously taking on values according to the the bits in the memory
allocated to hold them for preprocessed inputs.

Bug: 23516947
Change-Id: Ib57cd7f473995f7851d788deac39f9c4d9018e8f
Test: compiles and unittests pass
 2015-09-01 11:15:31 -07:00
Christopher Wiley
267cb88f4d Merge "Set up aidl for gtest" 2015-09-01 18:11:41 +00:00
Christopher Wiley
5fa874a30b am 26627d70: am 4d6cb77a: Merge "Tighten up compiler flags for aidl" 
* commit '26627d7011e8fbd66f0cabac5c3cb2a66c133d08':
  Tighten up compiler flags for aidl
 2015-09-01 16:51:12 +00:00
Dan Willemsen
83533a235c am 13786e28: am 60dd5d59: Merge "Remove USE_MINGW, whitelist windows modules" 
* commit '13786e281e4d67b9e2ff549fee34ddb3e82e0325':
  Remove USE_MINGW, whitelist windows modules
 2015-09-01 16:51:05 +00:00
Christopher Wiley
135fdcc76c am a6d16725: am a73e0045: Merge "Revert "Tighten up compiler flags for aidl"" 
* commit 'a6d167256d37f2b182658bb2d8ac6ed3f6258cb8':
  Revert "Tighten up compiler flags for aidl"
 2015-09-01 16:50:59 +00:00
Christopher Wiley
f9d0740352 am f7ea7c7b: am 1643e97b: Merge "aidl: Pull main() into dedicated file" 
* commit 'f7ea7c7b26dd129895c59be3b241d3676556fc42':
  aidl: Pull main() into dedicated file
 2015-09-01 16:50:53 +00:00
Christopher Wiley
fead6f025b am 72b1324c: am 2b83384f: Merge "Tighten up compiler flags for aidl" 
* commit '72b1324cb31ff155d580f9de148c609922218f50':
  Tighten up compiler flags for aidl
 2015-09-01 16:50:46 +00:00
Christopher Wiley
26627d7011 am 4d6cb77a: Merge "Tighten up compiler flags for aidl" 
* commit '4d6cb77ad92c9acadb5afc5d80be38dd3b63c3fa':
  Tighten up compiler flags for aidl
 2015-09-01 16:37:31 +00:00
Dan Willemsen
13786e281e am 60dd5d59: Merge "Remove USE_MINGW, whitelist windows modules" 
* commit '60dd5d5966ebe993f5a81c46d9dea62c207abfd3':
  Remove USE_MINGW, whitelist windows modules
 2015-09-01 16:37:10 +00:00
Christopher Wiley
a6d167256d am a73e0045: Merge "Revert "Tighten up compiler flags for aidl"" 
* commit 'a73e004516bae61bebe1e308f5b3ee295c1050b2':
  Revert "Tighten up compiler flags for aidl"
 2015-09-01 16:37:00 +00:00
Christopher Wiley
f7ea7c7b26 am 1643e97b: Merge "aidl: Pull main() into dedicated file" 
* commit '1643e97b330d6c0f47e8643e52b12c6887a89f81':
  aidl: Pull main() into dedicated file
 2015-09-01 16:36:52 +00:00
Christopher Wiley
72b1324cb3 am 2b83384f: Merge "Tighten up compiler flags for aidl" 
* commit '2b83384f44ffa30d1d3d61ded9ac4f83a275b77d':
  Tighten up compiler flags for aidl
 2015-09-01 16:36:37 +00:00
Christopher Wiley
5b88363ed3 Tighten up compiler flags for aidl 
Turn all warnings to errors, with special cases for places where
yacc forces us to be lenient.  Remove one variable with 0 references
elsewhere in the code.

These flags are confined to be clang only because the Windows SDK build
is using an older compiler that does not understand these flags.

Change-Id: I6407bd331c25b8845bde46e9a917bce1d6857bd8
 2015-08-31 13:55:46 -07:00
Dan Willemsen
60dd5d5966 Merge "Remove USE_MINGW, whitelist windows modules" 2015-08-31 19:30:57 +00:00
Christopher Wiley
a73e004516 Merge "Revert "Tighten up compiler flags for aidl"" 2015-08-31 19:13:04 +00:00
Christopher Wiley
ecaf21c377 Revert "Tighten up compiler flags for aidl" 
This reverts commit eea2353a3427f7d157c46e24ab6aba1378e16c2e.

This seems to have broken the build because whatever compiler the builder is using doesn't understand the same "turn off this warning" flags as my local host's compiler.

Change-Id: Ic68b7065b161a5ae683b7082c67147835833e0fa
 2015-08-31 19:07:40 +00:00
Christopher Wiley
2f77417cce aidl: Pull main() into dedicated file 
This separates the main() entry point from the functionality we're
hoping to test.  While here, redo the header guards to be consistent
accross the codebae.

Bug: 23516947
Change-Id: I61666126bdba0941f14bd0f031caaa30367b864a
Test: Compiles
 2015-08-31 10:54:26 -07:00
Christopher Wiley
eea2353a34 Tighten up compiler flags for aidl 
Turn all warnings to errors, with special cases for places where
yacc forces us to be lenient.  Remove one variable with 0 references
elsewhere in the code.

Change-Id: Ia7819795eb162e9c77d215088aee4c45bd87c1af
 2015-08-30 11:01:31 -07:00
Deepanshu Gupta
4845fa72c2 am b8ae1879: Merge "Fix android:theme parsing for custom views." into mnc-ub-dev 
* commit 'b8ae187932ff783711ea8715d7f5891d9e4ebb32':
  Fix android:theme parsing for custom views.
 2015-08-29 00:02:26 +00:00
Casey Dahlin
8a8775c1db Set up aidl for gtest 
Bug: 23516947

Change-Id: I1c004868525f462d04894a7b96c671b626061ab5
Signed-off-by: Casey Dahlin <sadmac@google.com>
 2015-08-28 16:21:53 -07:00
Dan Willemsen
4aa679ff96 Remove USE_MINGW, whitelist windows modules 
Bug: 23566667
Change-Id: Ie6b8c51e2b6d6273f99f4e361c440136d7c6915c
 2015-08-28 15:28:26 -07:00