OSDN Git Service
Todd Kennedy [Mon, 28 Sep 2015 18:20:38 +0000 (11:20 -0700)]
resolved conflicts for
4ed21bf0 to stage-aosp-master
Change-Id: I9c8ab83589ee3786c884f34066c1f3d709dc5136
Todd Kennedy [Mon, 28 Sep 2015 17:47:01 +0000 (17:47 +0000)]
Merge "Allow using the JIT"
Todd Kennedy [Fri, 25 Sep 2015 21:47:15 +0000 (14:47 -0700)]
Allow using the JIT
Instead of the JIT only being available for eng builds [or configurable
via environment variable], allow the JIT to be enabled programatically.
Change-Id: Ifcbc8445fb8bd45ce2bfed3f80fbaf48496f8e3a
Todd Kennedy [Fri, 25 Sep 2015 22:06:49 +0000 (15:06 -0700)]
resolved conflicts for
7de7e0b0 to stage-aosp-master
Change-Id: I4e45e5bbaebb98b0e740167eaf7517f99d917f30
Todd Kennedy [Fri, 25 Sep 2015 21:41:39 +0000 (21:41 +0000)]
Merge "Pass dexopt flags as integer"
Todd Kennedy [Fri, 25 Sep 2015 14:46:12 +0000 (07:46 -0700)]
Pass dexopt flags as integer
Instead of using a series of booleans, create a single flags integer
that contains all of the dexopt options.
Change-Id: Ia8fa968f64b164267f43dd29cea9dc0413058125
Todd Kennedy [Thu, 24 Sep 2015 21:34:06 +0000 (14:34 -0700)]
resolved conflicts for
cafacef6 to stage-aosp-master
Change-Id: Id02e098a02aede327c5bc1a98aa177d8bf9ec5a9
Todd Kennedy [Thu, 24 Sep 2015 20:35:09 +0000 (20:35 +0000)]
Merge "Frameworks/base: Propagate boot status to installd"
Andreas Gampe [Mon, 21 Sep 2015 20:20:07 +0000 (13:20 -0700)]
Frameworks/base: Propagate boot status to installd
Propagate the boot status explicitly to installd so that we do not
have to rely on dev.bootcomplete, which isn't meaningfully set
when the device needs the decryption screen on boot.
Bug:
23898216
(cherry picked from commit
06bb908b78e3c790d3db52fef9f2ab0a129e53cd)
Change-Id: I9b34298caf70b1e5d40970cc0d04c469016a80a7
Jeff Hao [Thu, 24 Sep 2015 17:39:34 +0000 (17:39 +0000)]
am
384d84f4: Merge "Shorten first boot time by filtering dexopted apps by LRU."
* commit '
384d84f4f02643b63335f6d8d884adc1186d6896':
Shorten first boot time by filtering dexopted apps by LRU.
Jeff Hao [Thu, 24 Sep 2015 17:30:25 +0000 (17:30 +0000)]
Merge "Shorten first boot time by filtering dexopted apps by LRU."
Jeff Hao [Wed, 23 Sep 2015 20:57:30 +0000 (13:57 -0700)]
Shorten first boot time by filtering dexopted apps by LRU.
No longer dexopt all system apps and boot listener user apps.
Bug:
23628238
Bug: https://code.google.com/p/android/issues/detail?id=186589
Change-Id: Ib4f960686afcfda13838f7783c2d3ccf8e26db72
Elliott Hughes [Thu, 24 Sep 2015 17:01:32 +0000 (10:01 -0700)]
resolved conflicts for
a884d81e to stage-aosp-master
Change-Id: Ice485967fa96f13786024b6939b826638e906ff0
Elliott Hughes [Thu, 24 Sep 2015 16:01:15 +0000 (16:01 +0000)]
Merge "constify JNINativeMethod function pointer tables"
Daniel Micay [Sat, 19 Sep 2015 21:31:01 +0000 (17:31 -0400)]
constify JNINativeMethod function pointer tables
Change-Id: I4036c924958221cbc644724f8eb01c5de3cd7954
Elliott Hughes [Tue, 22 Sep 2015 15:42:36 +0000 (15:42 +0000)]
am
0361b18e: Merge "WrapperInit: remove dead execStandalone method"
* commit '
0361b18ea10aa7987dbf8c4217d5f4c7e3a4a610':
WrapperInit: remove dead execStandalone method
Elliott Hughes [Tue, 22 Sep 2015 15:34:26 +0000 (15:34 +0000)]
Merge "WrapperInit: remove dead execStandalone method"
Daniel Micay [Mon, 21 Sep 2015 22:14:56 +0000 (18:14 -0400)]
WrapperInit: remove dead execStandalone method
This became dead with the removal of support for the non-runtime-init
code path in
f48029f00a66e23d7872a00b56fbcf88528ba476.
Change-Id: Id68e0da4658e83f0d3bfd8645152165faacac5fa
Alan Viverette [Fri, 18 Sep 2015 20:11:44 +0000 (20:11 +0000)]
am
24ff6823: Merge "prevent unnecessary warning logs caused by View.toString()"
* commit '
24ff6823c411f794aceaae89b0b029fbf8ef6b29':
prevent unnecessary warning logs caused by View.toString()
Alan Viverette [Fri, 18 Sep 2015 19:59:20 +0000 (19:59 +0000)]
Merge "prevent unnecessary warning logs caused by View.toString()"
kenzyun_chen [Fri, 3 Jul 2015 06:59:39 +0000 (14:59 +0800)]
prevent unnecessary warning logs caused by View.toString()
If the id is negative, it is not from Resource.
Passing the negative value to getResourcePackageName makes AssetManager dump unnecessary warning logs.
It is reasonable not to get package/type/entry information for the negative id.
The warning logs :
W/ResourceType( 3711): No known package when getting name for resource
number 0x9b010100
Change-Id: Ic89acb4f32205ba5a2fdac61dc14b00ccf251148
Stephen Hines [Tue, 15 Sep 2015 23:09:59 +0000 (23:09 +0000)]
am
ce6b9db4: Merge "Update docs for RS object API fixes."
* commit '
ce6b9db498b67c8136a9267c2f87b432a5f22206':
Update docs for RS object API fixes.
Stephen Hines [Tue, 15 Sep 2015 21:22:09 +0000 (21:22 +0000)]
Merge "Update docs for RS object API fixes."
Christopher Wiley [Mon, 14 Sep 2015 15:54:23 +0000 (08:54 -0700)]
Add a textual hint as to where aidl has gone
Bug:
23691099
Change-Id: I3fb917b4c0e66a83c6299add02869a7088010adc
Christopher Wiley [Mon, 14 Sep 2015 14:34:50 +0000 (07:34 -0700)]
resolved conflicts for
ddf53180 to stage-aosp-master
Change-Id: I265ab876ef29dc731e6abb6f964c10f2e71324be
Christopher Wiley [Mon, 14 Sep 2015 14:11:19 +0000 (14:11 +0000)]
Merge "Remove the aidl tool"
Selim Cinek [Sat, 12 Sep 2015 01:21:49 +0000 (01:21 +0000)]
am
4140a21e: Merge "Fix scrolling of QS panel when no notification is present."
* commit '
4140a21e2ec69089de916e240fd606a3daf09896':
Fix scrolling of QS panel when no notification is present.
Selim Cinek [Sat, 12 Sep 2015 01:10:10 +0000 (01:10 +0000)]
Merge "Fix scrolling of QS panel when no notification is present."
Christopher Wiley [Fri, 11 Sep 2015 21:24:24 +0000 (14:24 -0700)]
Remove the aidl tool
This has been moved into its own repository at
//system/tools/aidl
Test: Built aosp_arm-eng from scratch.
Bug:
23691099
Change-Id: Ic45d55682b9dcafe894efe0a6317792f9c1236c6
Shawn Willden [Fri, 11 Sep 2015 15:07:42 +0000 (09:07 -0600)]
resolved conflicts for
b15e1ff5 to stage-aosp-master
Change-Id: I28a843a94855193d4b90dc9bec028eb5338eeed7
Shawn Willden [Fri, 11 Sep 2015 13:21:15 +0000 (13:21 +0000)]
Merge "Update KeymasterDefs"
Jayasri bhattacharyya [Thu, 10 Sep 2015 10:30:10 +0000 (16:00 +0530)]
Fix scrolling of QS panel when no notification is present.
After boot when status bar donot have any notification, the
overscroll is rubberbanded , changes have been done to fix
this and make the behaviour consistent with other scenarios.
In NotificationStackScrollLayout when there is no childview
present at the touch coordinate, initialization of some
variable was not done which was resulting into overscroll
being rubberbanded.
Usecase of the issue:
1. Reboot the phone.
2. Make sure that no notification is present
3. Pull the status bar.
4. Now pull the "No notifactions" view ,the overscroll
is rubberbanded
5. Get some notifications, pull the status bar and then
the notifications, the overscroll is not rubberbanded
6. Remove all the notifications, now pull the statusbar
and then pull "No notifications" view the overscroll is not
rubberbanded.
Change-Id: I06d4f0e3d6ed980744be21b9fd7ed307dca69ca3
Signed-off-by: Jayasri bhattacharyya <jayabhatt@codeaurora.org>
Brian Carlstrom [Fri, 11 Sep 2015 05:15:37 +0000 (05:15 +0000)]
am
de2ad457: Merge "Revert "Grab macros from libbase instead of duplicating""
* commit '
de2ad45784499388d09f2c2c3bcf2fa1966cf018':
Revert "Grab macros from libbase instead of duplicating"
Brian Carlstrom [Fri, 11 Sep 2015 05:09:17 +0000 (05:09 +0000)]
Merge "Revert "Grab macros from libbase instead of duplicating""
Casey Dahlin [Fri, 11 Sep 2015 02:47:54 +0000 (02:47 +0000)]
Revert "Grab macros from libbase instead of duplicating"
This reverts commit
2535cae005512494469fc5cea1fe630288ecb083.
Change-Id: I373844b6a0f429e88d6bcc1cdd5ac62325da55b3
Stephen Hines [Fri, 11 Sep 2015 02:47:16 +0000 (02:47 +0000)]
am
3460304c: Merge "Update RS docs for M-related changes."
* commit '
3460304c5c656b2cbf2b371720edff4fd662b02d':
Update RS docs for M-related changes.
Casey Dahlin [Fri, 11 Sep 2015 02:41:51 +0000 (02:41 +0000)]
am
8b25009d: Merge "Revert change to win32 isatty stub"
* commit '
8b25009d92626e7f1bb3b8fdf2774df20ec7a769':
Revert change to win32 isatty stub
Casey Dahlin [Fri, 11 Sep 2015 02:41:43 +0000 (02:41 +0000)]
am
ec4cbf4f: Merge "Grab macros from libbase instead of duplicating"
* commit '
ec4cbf4f93ddb14653c27bfd7a169e010b87286c':
Grab macros from libbase instead of duplicating
Casey Dahlin [Fri, 11 Sep 2015 02:41:35 +0000 (02:41 +0000)]
am
7e8586fc: Merge "Convert to C++ Bison output"
* commit '
7e8586fc1e40e7d860b05757882c3617df968fb8':
Convert to C++ Bison output
Stephen Hines [Fri, 11 Sep 2015 02:34:20 +0000 (02:34 +0000)]
Merge "Update RS docs for M-related changes."
Casey Dahlin [Fri, 11 Sep 2015 02:30:32 +0000 (02:30 +0000)]
Merge "Revert change to win32 isatty stub"
Casey Dahlin [Fri, 11 Sep 2015 02:30:15 +0000 (02:30 +0000)]
Merge "Grab macros from libbase instead of duplicating"
Casey Dahlin [Fri, 11 Sep 2015 02:30:10 +0000 (02:30 +0000)]
Merge "Convert to C++ Bison output"
Casey Dahlin [Fri, 11 Sep 2015 02:13:49 +0000 (19:13 -0700)]
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>
Stephen Hines [Wed, 9 Sep 2015 01:53:51 +0000 (18:53 -0700)]
Update docs for RS object API fixes.
Bug:
22926131
This is the documentation update corresponding to our new named
structures for RS object types.
Change-Id: I282ce78192da7c9f68951ce05100819a306694f0
Casey Dahlin [Fri, 11 Sep 2015 01:47:28 +0000 (01:47 +0000)]
am
c71fdabd: Merge "First pass on reentrant C++-ish parser"
* commit '
c71fdabdd7dc46ef2914ee6fd3ba541689c91844':
First pass on reentrant C++-ish parser
Casey Dahlin [Fri, 11 Sep 2015 01:43:04 +0000 (18:43 -0700)]
Grab macros from libbase instead of duplicating
Change-Id: I1802f60a4dac45ddee8cd5715a73c77e4371d7e8
Signed-off-by: Casey Dahlin <sadmac@google.com>
Casey Dahlin [Fri, 11 Sep 2015 01:39:07 +0000 (01:39 +0000)]
Merge "First pass on reentrant C++-ish parser"
Casey Dahlin [Fri, 11 Sep 2015 01:29:09 +0000 (18:29 -0700)]
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>
Casey Dahlin [Thu, 10 Sep 2015 00:59:06 +0000 (17:59 -0700)]
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>
Shawn Willden [Thu, 10 Sep 2015 18:47:55 +0000 (12:47 -0600)]
Update KeymasterDefs
Change-Id: Iea788eb81c24dcaceeea35a6b004416caa1cf9c6
Stephen Hines [Thu, 27 Aug 2015 02:29:16 +0000 (19:29 -0700)]
Update RS docs for M-related changes.
This includes FP16 and the rs_kernel_context object.
Change-Id: If5574bba85060e2bfe6c4d8f2b3cc1b49827a05a
Alan Viverette [Thu, 10 Sep 2015 12:19:40 +0000 (12:19 +0000)]
am
a5ec056b: Merge "CalendarView: use theme attribute instead of style on MonthName TextView"
* commit '
a5ec056b8331b2560f5c6f9543471884894914f1':
CalendarView: use theme attribute instead of style on MonthName TextView
Alan Viverette [Thu, 10 Sep 2015 12:13:28 +0000 (12:13 +0000)]
Merge "CalendarView: use theme attribute instead of style on MonthName TextView"
Young-Ho Cha [Thu, 10 Sep 2015 06:03:26 +0000 (15:03 +0900)]
CalendarView: use theme attribute instead of style on MonthName TextView
Change-Id: I0d891ab08e61df7422fb0aea50a4c31196792189
Signed-off-by: Young-Ho Cha <ganadist@gmail.com>
Hans Boehm [Wed, 9 Sep 2015 22:41:42 +0000 (22:41 +0000)]
am
c0ce6c42: Merge "Reduce risk of memory corruption due to finalization."
* commit '
c0ce6c422cfe089e7a8e209ac924e37bed3ca770':
Reduce risk of memory corruption due to finalization.
Hans Boehm [Wed, 9 Sep 2015 22:28:42 +0000 (22:28 +0000)]
Merge "Reduce risk of memory corruption due to finalization."
Hans Boehm [Wed, 12 Nov 2014 01:01:37 +0000 (17:01 -0800)]
Reduce risk of memory corruption due to finalization.
Many classes in graphics/java and elsewhere deallocate native memory
in a finalizer on the assumption that instance methods can no longer
be called once the finalizer has been called. This is incorrect if
the object can be used, possibly indirectly, from another finalizer,
possibly one in the application.
This is the initial installment of a patch to cause such post-finalization
uses to at least see a null pointer rather than causing memory corruption
by accessing deallocated native memory. This should make it possible to
identify and fix such finalization ordering issues.
There are more graphics classes that need this treatment, and probably
many more in other subsystems.
This solution is < 100% effective if finalizers can be invoked
concurrently. We currently promise that they aren't.
(In my opinion, the real cause here is a language spec bug. But that ship
has sailed.)
Bug:
18178237
Change-Id: I844cf1e0fbb190407389c4f8e8f072752cca6198
Dan Willemsen [Fri, 4 Sep 2015 21:48:35 +0000 (21:48 +0000)]
am
596fd38a: Merge "Whitelist windows module"
* commit '
596fd38af207727d508a63fca39506c90ba29c44':
Whitelist windows module
Dan Willemsen [Fri, 4 Sep 2015 21:36:50 +0000 (21:36 +0000)]
Merge "Whitelist windows module"
Dan Willemsen [Fri, 4 Sep 2015 21:21:26 +0000 (14:21 -0700)]
Whitelist windows module
Bug:
23566667
Change-Id: I030733ffd2b43a0ea74b0fd5f34a0d13ef8dcf7c
Alan Viverette [Fri, 4 Sep 2015 12:31:46 +0000 (12:31 +0000)]
am
3d632546: (-s ours) Merge "Update mFillPaint color on GradientDrawable inflation"
* commit '
3d6325460ec19c89c40d2083e8ca89fe53d5575b':
Update mFillPaint color on GradientDrawable inflation
Alan Viverette [Fri, 4 Sep 2015 11:51:02 +0000 (11:51 +0000)]
Merge "Update mFillPaint color on GradientDrawable inflation"
Snild Dolkow [Fri, 4 Sep 2015 08:08:05 +0000 (10:08 +0200)]
Update mFillPaint color on GradientDrawable inflation
When a GradientDrawable is loaded from scratch, initializeWithState()
is called with mColors == null. This sets mFillPaint's color to
0x00000000 -- transparent. mColors is then properly set in inflate(),
but mFillPaint is not updated there. It will be updated eventually
through a mutate() or ensureValidRect() call, but that's sometimes too
late.
In our case, a wrapping StateListDrawable called getOpacity(), and
since it caches the result, it never got updated.
This doesn't cause any problems on preloaded GradientDrawables, since
the new GradientDrawable created when fetching a preload will call
initializeWithState() in its constructor, fixing the GradientState.
Change-Id: Ic8caa7c6a7c1d4dae5ff31ae943831bd2e014f79
Yasuhiro Matsuda [Fri, 4 Sep 2015 02:34:58 +0000 (02:34 +0000)]
am
53f1a815: Merge "Remove unnecessary finally blocks for tracing."
* commit '
53f1a815b4401f10cd833217143da44ab0408dcc':
Remove unnecessary finally blocks for tracing.
Yasuhiro Matsuda [Fri, 4 Sep 2015 02:23:31 +0000 (02:23 +0000)]
Merge "Remove unnecessary finally blocks for tracing."
Yasuhiro Matsuda [Thu, 3 Sep 2015 07:18:21 +0000 (16:18 +0900)]
Remove unnecessary finally blocks for tracing.
BUG:
22207144
Change-Id: I2b15bb7c4055a1ad589b433d4f253868813ab311
Christopher Wiley [Thu, 3 Sep 2015 00:31:52 +0000 (00:31 +0000)]
am
b1db04f3: Merge "aidl: Add end to end test"
* commit '
b1db04f371963cb61bc5df21142a59f77515a62f':
aidl: Add end to end test
Christopher Wiley [Thu, 3 Sep 2015 00:31:45 +0000 (00:31 +0000)]
am
b14e7b84: Merge "aidl: Remove example test"
* commit '
b14e7b84290fa40221e3f315862dd1f79bf21871':
aidl: Remove example test
Casey Dahlin [Wed, 2 Sep 2015 21:33:41 +0000 (14:33 -0700)]
resolved conflicts for merge of
9483748a to stage-aosp-master
Change-Id: I82fd3a6ddeffc564915e43b23b81293adf1f9b5d
Casey Dahlin [Wed, 2 Sep 2015 21:18:46 +0000 (21:18 +0000)]
am
02bc5488: Merge "Remove RPC interface Type"
* commit '
02bc5488c19dcae7f21c43c8f3a20138e01a04d9':
Remove RPC interface Type
Christopher Wiley [Wed, 2 Sep 2015 21:10:30 +0000 (21:10 +0000)]
Merge "aidl: Add end to end test"
Christopher Wiley [Wed, 2 Sep 2015 21:10:09 +0000 (21:10 +0000)]
Merge "aidl: Remove example test"
Casey Dahlin [Wed, 2 Sep 2015 21:02:02 +0000 (21:02 +0000)]
Merge "Delete outdated options tests"
Casey Dahlin [Wed, 2 Sep 2015 21:01:33 +0000 (21:01 +0000)]
Merge "Remove RPC interface Type"
Casey Dahlin [Wed, 2 Sep 2015 18:02:11 +0000 (11:02 -0700)]
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>
Casey Dahlin [Tue, 1 Sep 2015 20:21:26 +0000 (13:21 -0700)]
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>
Christopher Wiley [Tue, 1 Sep 2015 00:36:41 +0000 (17:36 -0700)]
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
Christopher Wiley [Wed, 2 Sep 2015 19:49:52 +0000 (12:49 -0700)]
aidl: Remove example test
We have enough tests demonstrating how to write them.
Bug:
23516947
Change-Id: I966cb6bb2d754db389be8f9b90957ac33cf66639
Test: Unittests pass.
Christopher Wiley [Wed, 2 Sep 2015 16:34:40 +0000 (16:34 +0000)]
am
f37947cb: Merge "aidl: Don\'t link librt on Mac"
* commit '
f37947cb1a452b81f7b25cf961763c2ec3db5632':
aidl: Don't link librt on Mac
Christopher Wiley [Wed, 2 Sep 2015 16:23:01 +0000 (16:23 +0000)]
Merge "aidl: Don't link librt on Mac"
Christopher Wiley [Wed, 2 Sep 2015 01:36:44 +0000 (18:36 -0700)]
aidl: Don't link librt on Mac
This fixes unittest build on Mac.
Change-Id: I5180f647d1b5b41f99c4d0423aaec9d05fee6355
Yasuhiro Matsuda [Wed, 2 Sep 2015 13:48:13 +0000 (22:48 +0900)]
resolved conflicts for merge of
ef57e5e0 to stage-aosp-master
Change-Id: I1c31b38936dc74619dea27f0d5eecab43360bb8c
Yasuhiro Matsuda [Wed, 2 Sep 2015 12:54:23 +0000 (12:54 +0000)]
Merge "Add trace code to system server."
Christopher Wiley [Tue, 1 Sep 2015 20:01:30 +0000 (20:01 +0000)]
am
dd80a6cf: Merge "aidl: Stop using Bionic\'s test main"
* commit '
dd80a6cf37799b41ae07c60137d312c5ea2db961':
aidl: Stop using Bionic's test main
Christopher Wiley [Tue, 1 Sep 2015 19:46:21 +0000 (19:46 +0000)]
Merge "aidl: Stop using Bionic's test main"
Christopher Wiley [Tue, 1 Sep 2015 19:39:25 +0000 (12:39 -0700)]
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
Christopher Wiley [Tue, 1 Sep 2015 18:49:12 +0000 (18:49 +0000)]
am
722bf5c7: Merge "aidl: Separate aidl logic into its own static library"
* commit '
722bf5c7dec37265021c17d35b0b078776699f97':
aidl: Separate aidl logic into its own static library
Christopher Wiley [Tue, 1 Sep 2015 18:34:32 +0000 (18:34 +0000)]
Merge "aidl: Separate aidl logic into its own static library"
Christopher Wiley [Tue, 1 Sep 2015 18:20:19 +0000 (18:20 +0000)]
am
267cb88f: Merge "Set up aidl for gtest"
* commit '
267cb88f4d4adb2cdddd9b29eb8fce7104507114':
Set up aidl for gtest
Christopher Wiley [Tue, 1 Sep 2015 18:07:48 +0000 (11:07 -0700)]
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
Christopher Wiley [Tue, 1 Sep 2015 18:11:41 +0000 (18:11 +0000)]
Merge "Set up aidl for gtest"
Nick Kralevich [Tue, 1 Sep 2015 16:37:59 +0000 (16:37 +0000)]
am
9d586927: Merge "Automatically assign default seinfo labels using the string "default"."
* commit '
9d586927102b597845607ccc82661e350821de82':
Automatically assign default seinfo labels using the string "default".
Christopher Wiley [Tue, 1 Sep 2015 16:37:31 +0000 (16:37 +0000)]
am
4d6cb77a: Merge "Tighten up compiler flags for aidl"
* commit '
4d6cb77ad92c9acadb5afc5d80be38dd3b63c3fa':
Tighten up compiler flags for aidl
Dan Willemsen [Tue, 1 Sep 2015 16:37:10 +0000 (16:37 +0000)]
am
60dd5d59: Merge "Remove USE_MINGW, whitelist windows modules"
* commit '
60dd5d5966ebe993f5a81c46d9dea62c207abfd3':
Remove USE_MINGW, whitelist windows modules
Christopher Wiley [Tue, 1 Sep 2015 16:37:00 +0000 (16:37 +0000)]
am
a73e0045: Merge "Revert "Tighten up compiler flags for aidl""
* commit '
a73e004516bae61bebe1e308f5b3ee295c1050b2':
Revert "Tighten up compiler flags for aidl"
Christopher Wiley [Tue, 1 Sep 2015 16:36:52 +0000 (16:36 +0000)]
am
1643e97b: Merge "aidl: Pull main() into dedicated file"
* commit '
1643e97b330d6c0f47e8643e52b12c6887a89f81':
aidl: Pull main() into dedicated file
Christopher Wiley [Tue, 1 Sep 2015 16:36:37 +0000 (16:36 +0000)]
am
2b83384f: Merge "Tighten up compiler flags for aidl"
* commit '
2b83384f44ffa30d1d3d61ded9ac4f83a275b77d':
Tighten up compiler flags for aidl
Nick Kralevich [Tue, 1 Sep 2015 13:39:10 +0000 (13:39 +0000)]
Merge "Automatically assign default seinfo labels using the string "default"."
Robert Craig [Fri, 28 Aug 2015 16:11:41 +0000 (12:11 -0400)]
Automatically assign default seinfo labels using the string "default".
default seinfo values are those for which policy lacks a
matching stanza in the corresponding mac_permissions.xml
file. Prior to this change the null object reference was
used to represent the non-matching state. This is in
contrast to a policy supplied default stanza which will
assign a non null seinfo value. Confused yet?
Basically, two default states were distinguished in the
code to describe the two cases where either a policy stanza
spelled out the base case seinfo label or not. Policy
writers could either supply a default stanza or rely on
the class instantiated value assigned by the ApplicationInfo
object. The hope was that the later assignment could be
used to help distinguish the cases where policy writers
intentionally white listed apps. This change will just use
the hard coded "default" string implicitly to describe all
cases and removes the idea of a policy supplied default stanza.
Change-Id: Ib7b01ee004775f24db9a69340a31784b967ce030
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>