summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-05-10Remove internal Runtime APEX library that shouldn't be in system.android-mainline-10.0.0_r9android-mainline-10.0.0_r7android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-10.0.0_r9android-10.0.0_r8android-10.0.0_r7android-10.0.0_r45android-10.0.0_r44android-10.0.0_r43android-10.0.0_r42android-10.0.0_r41android-10.0.0_r40android-10.0.0_r39android-10.0.0_r38android-10.0.0_r37android-10.0.0_r36android-10.0.0_r35android-10.0.0_r34android-10.0.0_r33android-10.0.0_r32android-10.0.0_r31android-10.0.0_r30android-10.0.0_r14android-10.0.0_r13android-10.0.0_r12android10-qpr3-s1-releaseandroid10-qpr3-releaseandroid10-qpr2-s4-releaseandroid10-qpr2-s3-releaseandroid10-qpr2-s2-releaseandroid10-qpr2-s1-releaseandroid10-qpr2-releaseandroid10-qpr1-mainline-releaseandroid10-mainline-media-releaseandroid10-devandroid10-d4-s1-releaseandroid10-d4-releaseandroid10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-releaseMartin Stjernholm
(cherry picked from commit c36f2fa9688ebd034a071d878f2cc15be86a64d2) Bug: 132289438 Merged-In: I4e826afe69acc8c99599e6f7626588009b493691 Change-Id: I770b4ae2efac433e58411ee38d3a70a09edd3f6b
2019-04-09Remove device-only packages from PRODUCT_HOST_PACKAGESDan Willemsen
Also remove adbd, which is almost definitely not required. Bug: 123925742 Test: treehugger Change-Id: I7a8149dff5c1cf2e4130786bf07c76cf7d6237ab Merged-In: I7a8149dff5c1cf2e4130786bf07c76cf7d6237ab (cherry picked from commit 1645d74b34a23f08682ec7221dd427ab041d891f)
2019-03-19Remove host-only packages from PRODUCT_PACKAGES am: 28d7dbd0a9 am: 44880d17d1Dan Willemsen
am: 51a4d14afa Change-Id: I4b5f5812f89c4cfdb2ec78b8d93baebfb563fd29
2019-03-19Remove host-only packages from PRODUCT_PACKAGES am: 28d7dbd0a9Dan Willemsen
am: 44880d17d1 Change-Id: I1a74aa15b2ff2ed818cb5d4a7afa6fed2a1bc253
2019-03-19Remove host-only packages from PRODUCT_PACKAGESDan Willemsen
am: 28d7dbd0a9 Change-Id: I5160307fdd4aca44a076750a006e8d8ad93f180c
2019-03-19Remove host-only packages from PRODUCT_PACKAGESDan Willemsen
Test: treehugger Change-Id: I496cd01c9ab7e248ae062d29510ca2066102490b
2019-03-07[automerger skipped] Add PRODUCT_HOST_PACKAGES for all host modules in ↵Dan Willemsen
PRODUCT_PACKAGES am: 1e2359eb00 am: c26c0ade52 am: 46bfb5fbc7 -s ours am skip reason: change_id I8a521e54f7fbdc0a03494263923730ab27a4eb7e with SHA1 a4692d9a77 is in history Change-Id: Iff4221d63d9e9dc9dc2aaefc5b397afddf126dea
2019-03-07Add PRODUCT_HOST_PACKAGES for all host modules in PRODUCT_PACKAGES am: ↵Dan Willemsen
1e2359eb00 am: c26c0ade52 Change-Id: I719686e7464b0497bcf23dae6c4e0c182015a8be
2019-03-07Add PRODUCT_HOST_PACKAGES for all host modules in PRODUCT_PACKAGESDan Willemsen
am: 1e2359eb00 Change-Id: I48535db5969e82b7fa3ff50649c40970a57b1999
2019-03-06Add PRODUCT_HOST_PACKAGES for all host modules in PRODUCT_PACKAGESandroid-q-preview-1android-o-mr1-iot-release-1.0.10Dan Willemsen
In preparation for splitting PRODUCT_HOST_PACKAGES and PRODUCT_PACKAGES Test: treehugger Change-Id: I8a521e54f7fbdc0a03494263923730ab27a4eb7e Merged-In: I8a521e54f7fbdc0a03494263923730ab27a4eb7e
2019-02-25Merge stage-aosp-master into pi-dev-plus-aospXin Li
am: 131c48a33a Change-Id: I61d28130db026e842fb89a6eeb5904ee295246ad
2019-02-25Merge stage-aosp-master into pi-dev-plus-aospXin Li
Bug: 126125118 Change-Id: Ic2264efd918b8016f2ece99376dee854b0b82dbf
2019-02-20DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterXin Li
Bug: 120848293 Change-Id: I1aa111672a9dfdb831a23fb91ea931f3ea2ce711
2019-02-19Add PRODUCT_HOST_PACKAGES for all host modules in PRODUCT_PACKAGESDan Willemsen
In preparation for splitting PRODUCT_HOST_PACKAGES and PRODUCT_PACKAGES Test: treehugger Change-Id: I8a521e54f7fbdc0a03494263923730ab27a4eb7e
2019-02-06[automerger skipped] Remove libsurfaceflinger_ddmconnection from ↵Orion Hodson
PRODUCT_PACKAGES am: cf45aa3001 am: 2447a96f47 am: 6e1b5b4f2d -s ours am skip reason: change_id I085b214f0ce438b26c282b65dfd61a78b7251893 with SHA1 7278a5f006 is in history Change-Id: I1a84e4a3488bad6ea8c7441a6b59f128a7dbb02c
2019-02-06Remove libsurfaceflinger_ddmconnection from PRODUCT_PACKAGES am: cf45aa3001Orion Hodson
am: 2447a96f47 Change-Id: I84565023c6c46880fad832b4dcc8620930cec07b
2019-02-06Remove libsurfaceflinger_ddmconnection from PRODUCT_PACKAGESOrion Hodson
am: cf45aa3001 Change-Id: I1fca88dfdf18b659500178b6e7762d92c94de6e3
2019-02-05Remove libsurfaceflinger_ddmconnection from PRODUCT_PACKAGESOrion Hodson
DdmConnection dlopen's libart.so which is undesirable for the Runtime Module. Bug: 120782499 Test: m -j100 Change-Id: I085b214f0ce438b26c282b65dfd61a78b7251893 Merged-In: I085b214f0ce438b26c282b65dfd61a78b7251893
2019-02-04Remove libsurfaceflinger_ddmconnection from PRODUCT_PACKAGESOrion Hodson
DDMS dlopen's libart.so which is undesirable for the Runtime Module. Bug: 120782499 Test: m -j100 Change-Id: I085b214f0ce438b26c282b65dfd61a78b7251893
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT ↵Bill Yi
MERGE am: 501be3709a -s ours am: 1cba242c0e -s ours am: 2c77f7e4a3 -s ours Change-Id: Ib780cb7e59c61c805f3ea8951541d8d6146a674a
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT ↵Bill Yi
MERGE am: 501be3709a -s ours am: 1cba242c0e -s ours Change-Id: If84e8aa7d5fc9cbd7ff85fa8aa2204a47b439a58
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGEBill Yi
am: 501be3709a -s ours Change-Id: Idcad9b117d031c28496a462bfe119d9505aa012e
2018-10-24Merge pie-platform-release to aosp-master - DO NOT MERGEandroid-wear-8.0.0_r2android-o-mr1-iot-release-smart-display-r9android-o-mr1-iot-release-smart-display-r8android-o-mr1-iot-release-smart-display-r5android-o-mr1-iot-release-smart-display-r40.1Jandroid-o-mr1-iot-release-smart-display-r4android-o-mr1-iot-release-smart-display-r39android-o-mr1-iot-release-smart-display-r30android-o-mr1-iot-release-smart-display-r22android-o-mr1-iot-release-smart-display-r14android-o-mr1-iot-release-smart-clock-r6android-o-mr1-iot-release-smart-clock-r2android-o-mr1-iot-release-smart-clock-fsiandroid-o-mr1-iot-release-smart-clock-fcsandroid-o-mr1-iot-release-cube_r2android-o-mr1-iot-release-cube-fsiandroid-o-mr1-iot-release-cube-fcsandroid-o-mr1-iot-release-1.0.8android-o-mr1-iot-release-1.0.7Bill Yi
Change-Id: I8db0b74ddbc5f1d1990d5258d8c0bfb8a97f5108
2018-10-24[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ↵Bill Yi
MERGE am: 667b285a3f -s ours am: 00b263214b -s ours Change-Id: Iaee5fa8f4c0de79342681a6dce62a36f90ffcfd6
2018-10-24[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ↵Bill Yi
MERGE am: 667b285a3f -s ours Change-Id: I5f379befa5fa7449fd410c76f1ec8d8419c2928e
2018-10-24Merge pi-platform-release to stage-aosp-master - DO NOT MERGEBill Yi
Change-Id: Ic8c21f683cfaeb2cddce0f9df6015e51980af928
2018-09-28Add system_file_type am: 3085f599e9 am: 22a3a5525bNick Kralevich
am: dd5b6889ff Change-Id: I97f305ef60d10071e14e13a84a03f6b8e4fea75c
2018-09-28Add system_file_type am: 3085f599e9Nick Kralevich
am: 22a3a5525b Change-Id: Id7df35c061aa76ca3bae48d53caf7caf59cead3f
2018-09-28Add system_file_typeNick Kralevich
am: 3085f599e9 Change-Id: Ie74c2f9c80bc42177c9045d8028afcd8edf898ee
2018-09-27Add system_file_typeandroid-o-mr1-iot-release-smart-display-r3android-o-mr1-iot-release-1.0.5oreo-mr1-1.2-iot-releasemaster-cuttlefish-testing-releaseNick Kralevich
This file resides on /system, so must be annotated with the system_file_type attribute. Test: Policy compiles. Change-Id: I52b77fd60060ca85562c8742e9efd129f6973a10
2018-08-08Merge Android Pie into master am: 29abf559b6 am: 0c34313faf am: e27be0460cXin Li
am: 0722c87919 Change-Id: I209459fe8cd96f07a7ab02d035410b5110c17fda
2018-08-07Merge Android Pie into master am: 29abf559b6 am: 0c34313fafXin Li
am: e27be0460c Change-Id: I9a505bf8146ee3d7871832f6365c6e10ea10d4eb
2018-08-07Merge Android Pie into master am: 29abf559b6Xin Li
am: 0c34313faf Change-Id: I954c554edfabe66a9e946dd932761a2fac325b07
2018-08-07Merge Android Pie into masterXin Li
am: 29abf559b6 Change-Id: Ib031fdfa328d2b575fb0121ca33ea2fd5a6c304f
2018-08-06Merge Android Pie into masterandroid-o-mr1-iot-release-1.0.4android-o-mr1-iot-release-1.0.3Xin Li
Bug: 112104996 Change-Id: I1f943617cf1a1b71ff731d89fc7e4b81f688a6c9
2018-06-20Stop overwriting surfaceflinger.rc am: 0d977b69ff am: d393ed2226Dan Willemsen
am: 34e9f46ef3 Change-Id: I49fdaa2b74fa9e0c2d943f33a5462dbee5eb8ee8
2018-06-20Stop overwriting surfaceflinger.rc am: 0d977b69ffDan Willemsen
am: d393ed2226 Change-Id: I1f83c12cc8acc5c92d045084417b41054c119c75
2018-06-20Stop overwriting surfaceflinger.rctemp_p_mergeDan Willemsen
am: 0d977b69ff Change-Id: I9719e2929e5ec15d34f8dc8663375482a53999b5
2018-06-19Stop overwriting surfaceflinger.rcandroid-p-preview-5android-p-preview-4android-o-mr1-iot-release-1.0.2Dan Willemsen
Now that embedded.mk has been inserted into uml.mk, just remove surfaceflinger. Test: m; check for surfaceflinger Change-Id: I811ed02b2b02097da1fa885b7ab4e35ca4bea633
2018-06-19[automerger skipped] Inline contents from embedded.mk in uml. am: aa1078912f ↵Anton Hansson
-s ours am: fa1935dfe7 -s ours am: b84800c387 -s ours Change-Id: If701fe13eff49f0e8d729ceab155d95ef3e4eec8
2018-06-19[automerger skipped] Inline contents from embedded.mk in uml. am: aa1078912f ↵Anton Hansson
-s ours am: fa1935dfe7 -s ours Change-Id: I56df678b468ccd040ecc075b420d9099e86e9eaa
2018-06-19[automerger skipped] Inline contents from embedded.mk in uml.Anton Hansson
am: aa1078912f -s ours Change-Id: Ida599c569b7e88f50af6ffd267e4a67275e654fc
2018-06-19[automerger skipped] Inline contents from embedded.mk in uml. am: 519ee58ec3 ↵Anton Hansson
-s ours am: 0744ba8e0a -s ours Change-Id: Id6d7e754ec38cfcdc3d58c3a7776e75a3133444a
2018-06-19Inline contents from embedded.mk in uml.Anton Hansson
am: bb51b1f173 Change-Id: I9831bb4d2c463ce0da90f711ada74345740e55c0
2018-06-19[automerger skipped] Inline contents from embedded.mk in uml.Anton Hansson
am: 519ee58ec3 -s ours Change-Id: I6ea09ba6a83d530d22a8cc0519fd6bdb4a3688d5
2018-06-18Inline contents from embedded.mk in uml.Anton Hansson
embedded.mk is being deleted, so inline its contents in uml.mk which is one of the only two targets inheriting it. Bug: 80410283 Test: diff products variables with multiproduct_kati Change-Id: I620296cfa62ed8b6fcab3264eb1d42799263e5e2 Merged-In: I620296cfa62ed8b6fcab3264eb1d42799263e5e2
2018-06-18Inline contents from embedded.mk in uml.Anton Hansson
embedded.mk is being deleted, so inline its contents in uml.mk which is one of the only two targets inheriting it. Bug: 80410283 Test: diff products variables with multiproduct_kati Change-Id: I620296cfa62ed8b6fcab3264eb1d42799263e5e2 Merged-In: I620296cfa62ed8b6fcab3264eb1d42799263e5e2
2018-06-18Inline contents from embedded.mk in uml.Anton Hansson
embedded.mk is being deleted, so inline its contents in uml.mk which is one of the only two targets inheriting it. Bug: 80410283 Test: diff products variables with multiproduct_kati Change-Id: I620296cfa62ed8b6fcab3264eb1d42799263e5e2
2018-04-04Switch from add_lunch_combo to COMMON_LUNCH_CHOICES am: cdc20aa5e0 am: ↵Dan Willemsen
6de7eff7c0 am: 7ef166a2b3 Change-Id: I3bea83cf591a5f6e38efc956b2d2f918eb9e6181
2018-04-04Switch from add_lunch_combo to COMMON_LUNCH_CHOICES am: cdc20aa5e0Dan Willemsen
am: 6de7eff7c0 Change-Id: Ic6c8a90cfc30fd14dd263610266ba0f9cfb3440d