From 0a30e53bcd21bbb629896e48796144157296412c Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Queru Date: Thu, 7 Jun 2012 11:33:01 -0700 Subject: Factory images for IMM76I Change-Id: I1c9a5dc0c436b9dc9b170fae003dee5633aa8010 --- factory-images/generate-factory-images-package.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/factory-images/generate-factory-images-package.sh b/factory-images/generate-factory-images-package.sh index a7a62e5..3ba6e5a 100755 --- a/factory-images/generate-factory-images-package.sh +++ b/factory-images/generate-factory-images-package.sh @@ -18,20 +18,21 @@ # 228551 = ITL41F # 235179 = ICL53F # 299849 = IMM76D +# 330937 = IMM76I -BUILD=299849 +BUILD=330937 DEVICE=maguro PRODUCT=yakju -VERSION=imm76d +VERSION=imm76i BOOTLOADER=primela03 RADIO=i9250xxla02 source ../../../common/generate-factory-images-common.sh -BUILD=299849 +BUILD=330937 DEVICE=maguro PRODUCT=takju -VERSION=imm76d +VERSION=imm76i BOOTLOADER=primela03 RADIO=i9250xxla02 -- cgit v1.1 From 78580f557b8e669af8c916544749c06f4ba31bd1 Mon Sep 17 00:00:00 2001 From: Nick Pelly Date: Mon, 11 Jun 2012 14:58:02 -0700 Subject: Include a realistic wifi.scan mA value. With a wakelock on, and the screen off, I measured the current delta when a passive wifi scan is triggered. It is around 100mA. Bug: 6642581 Change-Id: I27f515c4a855802edcc2d80e6835481d53ea5f47 --- overlay/frameworks/base/core/res/res/xml/power_profile.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/overlay/frameworks/base/core/res/res/xml/power_profile.xml b/overlay/frameworks/base/core/res/res/xml/power_profile.xml index 9bb46a8..feebd3a 100644 --- a/overlay/frameworks/base/core/res/res/xml/power_profile.xml +++ b/overlay/frameworks/base/core/res/res/xml/power_profile.xml @@ -27,7 +27,7 @@ 160 1 150 - 200 + 100 150 200 150 -- cgit v1.1 From aeccff5b16a2239963f120a894fcb904044c7a8a Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Queru Date: Sat, 23 Jun 2012 09:10:27 -0700 Subject: Add invensense license. Minor tweaks. Change-Id: I9c8ffa2a8bc14d4ab9759220f325742323e1a8f1 --- self-extractors/broadcom/LICENSE | 2 +- self-extractors/generate-packages.sh | 23 ++-- self-extractors/invensense/COPYRIGHT | 2 +- self-extractors/invensense/LICENSE | 219 ++++++++++++++++++++++++++++++++++- 4 files changed, 228 insertions(+), 18 deletions(-) diff --git a/self-extractors/broadcom/LICENSE b/self-extractors/broadcom/LICENSE index 312dec7..3f2a075 100644 --- a/self-extractors/broadcom/LICENSE +++ b/self-extractors/broadcom/LICENSE @@ -22,7 +22,7 @@ CONDITIONS OF THIS AGREEMENT. open-source contribution developed by You, designed to operate with Android that does not contain or incorporate any of the Software. - c. The term "Authorized Android Enabled Device" means the device + c. The term "Authorized Android Enabled Device" means only the device identified on the site from which You downloaded the Software. The term "Software" means the Licensor's proprietary software and libraries in object code form, designed for use on the Authorized diff --git a/self-extractors/generate-packages.sh b/self-extractors/generate-packages.sh index 52856ec..aa7e157 100755 --- a/self-extractors/generate-packages.sh +++ b/self-extractors/generate-packages.sh @@ -26,21 +26,22 @@ # 262866 = IMM30D # 299849 = IMM76D # end ics-mr1 -# start jellybean +# start jb-dev # 241580 = IRL89 # 241968 = IRM03 -# end jellybean -BRANCH=jellybean +# 391496 = JRN83D +# end jb-dev +BRANCH=jb-dev if test $BRANCH=ics-mr1 then ZIP=yakju-ota-299849.zip BUILD=imm76d fi # ics-mr1 -if test $BRANCH=jellybean +if test $BRANCH=jb-dev then - ZIP=yakju-ota-241968.zip - BUILD=irm03 -fi # jellybean + ZIP=yakju-ota-391496.zip + BUILD=jrn83d +fi # jb-dev ROOTDEVICE=maguro DEVICE=maguro MANUFACTURER=samsung @@ -113,14 +114,6 @@ do then chmod a+x $FILEDIR/$(basename $ONE_FILE) || echo \ \ \ \ Error chmoding $ONE_FILE fi - if test $(echo $ONE_FILE | grep \\.apk\$ | wc -l) = 1 - then - echo \ \ \ \ Splitting $ONE_FILE - mkdir -p $FILEDIR/$(basename $ONE_FILE).parts || echo \ \ \ \ Error making parts dir for $ONE_FILE - unzip $FILEDIR/$(basename $ONE_FILE) -d $FILEDIR/$(basename $ONE_FILE).parts > /dev/null || echo \ \ \ \ Error unzipping $ONE_FILE - rm $FILEDIR/$(basename $ONE_FILE) || echo \ \ \ \ Error removing original $ONE_FILE - rm -rf $FILEDIR/$(basename $ONE_FILE).parts/META-INF || echo \ \ \ \ Error removing META-INF for $ONE_FILE - fi done echo \ \ Setting up $COMPANY-specific makefiles cp -R $COMPANY/staging/* tmp/vendor/$COMPANY/$DEVICE || echo \ \ \ \ Error copying makefiles diff --git a/self-extractors/invensense/COPYRIGHT b/self-extractors/invensense/COPYRIGHT index 38ff3f3..ee0d384 100644 --- a/self-extractors/invensense/COPYRIGHT +++ b/self-extractors/invensense/COPYRIGHT @@ -1 +1 @@ -# (C) Invensense. All Rights Reserved. +# (C) Invensense, Inc. diff --git a/self-extractors/invensense/LICENSE b/self-extractors/invensense/LICENSE index 9823b7a..480d51a 100644 --- a/self-extractors/invensense/LICENSE +++ b/self-extractors/invensense/LICENSE @@ -1 +1,218 @@ -INVENSENSE LICENSE GOES HERE +THIS DEVELOPER SOFTWARE LICENSE AGREEMENT (THE "AGREEMENT") IS A LEGALLY +BINDING AGREEMENT BETWEEN Invensense, Inc. ("LICENSOR") AND +YOU OR THE LEGAL ENTITY YOU REPRESENT ("You" or its possessive, "Your"). BY +TYPING "I ACCEPT" WHERE INDICATED YOU ACKNOWLEDGE THAT YOU HAVE READ THIS +AGREEMENT, UNDERSTAND IT AND AGREE TO BE BOUND BY ITS TERMS AND CONDITIONS. IF +YOU DO NOT AGREE TO THESE TERMS YOU MUST DISCONTINUE THE INSTALLATION PROCESS +AND YOU SHALL NOT USE THE SOFTWARE OR RETAIN ANY COPIES OF THE SOFTWARE OR +DOCUMENTATION. ANY USE OR POSSESSION OF THE SOFTWARE BY YOU IS SUBJECT TO THE +TERMS AND CONDITIONS SET FORTH IN THIS AGREEMENT. IF THE SOFTWARE IS INSTALLED +ON A COMPUTER OWNED BY A CORPORATION OR OTHER LEGAL ENTITY, THEN YOU REPRESENT +AND WARRANT THAT YOU HAVE THE AUTHORITY TO BIND SUCH ENTITY TO THE TERMS AND +CONDITIONS OF THIS AGREEMENT. + + 1. Special Definitions + + a. The term "Android" means the open source mobile platform, software + stack, operating system, middleware, application programming + interfaces and mobile applications under the trade-name "Android" + distributed at Android.com. + + b. The term "Android Applications" means a software application or + open-source contribution developed by You, designed to operate with + Android that does not contain or incorporate any of the Software. + + c. The term "Authorized Android Enabled Device" means only the device + identified on the site from which You downloaded the Software. + The term "Software" means the Licensor's proprietary software and + libraries in object code form, designed for use on the Authorized + Android Enabled Device. + + d. The term "Authorized Android Enabled Device Software" means a + packaged build for Authorized Android Enabled Devices, consisting of + files suitable for installation on an Authorized Android Enabled + Device using a mechanism such as fastboot mode or recovery mode. + + 2. License Grant + + a. Subject to the terms of this Agreement, Licensor hereby grants to + You, free of charge, a non-exclusive, non-sublicensable, + non-transferable, limited license, during the term of this Agreement, + to download, install and use the Software internally in + machine-readable (i.e., object code) form and the Documentation for + non-commercial use on an Authorized Android Enabled Device and + non-commercial redistribution of the Authorized Android Enabled + Device Software (the "Limited Purpose"). You may grant your end users + the right to use the Software for the Limited Purpose. The license to + the Software granted to You hereunder is solely for the Limited + Purpose set forth in this section, and the Software shall not be used + for any other purpose. + + 3. Restrictions + + a. Retention of Rights. The entire right, title and interest in the + Software shall remain with Licensor and, unless specified in writing + hereunder, no rights are granted to any of the Software. Except for + the right to use the Software for the Limited Purpose, the delivery + of the Software to You does not convey to You any intellectual + property rights in the Software, including, but not limited to any + rights under any patent, trademark, copyright, or trade secret. + Neither the delivery of the Software to You nor any terms set forth + herein shall be construed to grant to You, either expressly, by + implication or by way of estoppel, any license under any patents or + other intellectual property rights covering or relating to any other + product or invention or any combination of the Software with any + other product. Any rights not expressly granted to You herein are + reserved by Licensor. + + b. No Commercialization or Distribution of the Software and + Documentation. Except as expressly provided in Section 2 of this + Agreement, You shall have no right to (i) copy, disclose, distribute, + publically perform, publically display, transfer, alter, modify, + translate, disassemble, decompile, reverse engineer, or adapt the + Software and Documentation, or any portion thereof, or create any + derivative works based thereon; (ii) rent, lease, assign, sublicense, + resell, disclose or otherwise transfer the Software and Documentation + in whole or in part to any third party (iii) use the Software and + Documentation except for the Limited Purpose, (iv) remove or alter + any of the copyright or proprietary notices contained in any of the + Software and Documentation. For the purposes of clarity, nothing in + this Agreement prohibits You from making and distributing Android + Applications under commercial or non-commercial terms, provided that + You shall not contain, incorporate, and/or compile the Software or + any of its derivative works, in whole or in part, into Your Android + Applications and/or any software/devices created by You or by third + parties acting on Your behalf. You and any such third party shall + comply with all of the terms and conditions of this Agreement. + + c. No Reverse Engineering. Except for any portions of the Software + provided to You in source code format and except for any third party + code distributed with the Software that is licensed under contrary + terms, You will not reverse engineer, disassemble, + decompile, or translate the Software, or otherwise attempt to derive + the source code version of the Software, except if and to the extent + expressly permitted under any applicable law. + + d. Third Party Software. You agree that Android may contain third party + software. You agree that you may not distribute such third party + software for any purpose without appropriate licenses from the + applicable third party or parties. + + e. No Transfer or Assignment. You shall not assign any of its rights or + obligations under this Agreement. Any attempted assignment in + contravention of this Section shall be void. + + 4. Indemnity + + a. You agree to indemnify and hold harmless Licensor and its officers, + directors, customers, employees and successors and assigns (each an + "Indemnified Party") against any and all claims, demands, causes of + action, losses, liabilities, damages, costs and expenses, incurred by + the Indemnified Party (including but not limited to costs of defense, + investigation and reasonable attorney's fees) arising out of, + resulting from or related to (i) any software, products, + documentation, content, materials or derivative works created or + developed by You using the Software which causes an infringement of + any patent, copyright, trademark, trade secret, or other property, + publicity or privacy rights of any third parties arising in any + jurisdiction anywhere in the world, (ii) the download, distribution, + installation, storage, execution, use or transfer of such software, + products, documentation, content, materials or derivative works by + any person or entity, and/or (iii) any breach of this Agreement by + You. If requested by an Indemnified Party, You agree to defend such + Indemnified Party in connection with any third party claims, demands, + or causes of action resulting from, arising out of or in connection + with any of the foregoing. + + 5. Limitation of Liability + + a. TO THE MAXIMUM EXTENT PERMITTED UNDER APPLICABLE LAWS, UNDER NO + CIRCUMSTANCES, INCLUDING WITHOUT LIMITATION NEGLIGENCE, SHALL + LICENSOR, ITS AFFILIATES AND/OR ITS DIRECTORS, OFFICERS, EMPLOYEES OR + AGENTS BE LIABLE FOR ANY INDIRECT, INCIDENTAL, SPECIAL, PUNITIVE OR + CONSEQUENTIAL DAMAGES (INCLUDING BUT NOT LIMITED TO DAMAGES FOR LOSS + OF BUSINESS PROFITS, BUSINESS INTERRUPTION, LOSS OF BUSINESS + INFORMATION AND THE LIKE) ARISING OUT OF OR IN CONNECTION WITH THE + SOFTWARE OR ANY DOWNLOAD, INSTALLATION OR USE OF, OR INABILITY TO + USE, THE SOFTWARE, EVEN IF LICENSOR HAS BEEN ADVISED OF THE + POSSIBILITY OF SUCH DAMAGES. SOME JURISDICTIONS DO NOT ALLOW THE + LIMITATION OR EXCLUSION OF LIABILITY FOR INCIDENTAL OR CONSEQUENTIAL + DAMAGES SO THE ABOVE LIMITATION OR EXCLUSION MAY NOT APPLY OR MAY BE + LIMITED. IN NO EVENT SHALL LICENSOR'S TOTAL AGGREGATE LIABILITY TO + YOU FOR ANY AND ALL DAMAGES, LOSSES, CLAIMS AND CAUSES OF ACTIONS + (WHETHER IN CONTRACT, TORT, INCLUDING NEGLIGENCE, INDEMNIFICATION OR + OTHERWISE) EXCEED ONE HUNDRED U.S. DOLLARS (US$100). THE LIMITATIONS + SET FORTH IN THIS PARAGRAPH SHALL BE DEEMED TO APPLY TO THE MAXIMUM + EXTENT PERMITTED BY APPLICABLE LAW. THE PARTIES HAVE FULLY CONSIDERED + THE FOREGOING ALLOCATION OF RISK AND FIND IT REASONABLE, AND THAT THE + FOREGOING LIMITATIONS IN THIS PARAGRAPH ARE AN ESSENTIAL BASIS OF + THE BARGAIN BETWEEN THE PARTIES. + + 6. No Warranty + + a. LICENSOR MAKES NO WARRANTIES, EXPRESS OR IMPLIED, WITH RESPECT TO THE + SOFTWARE AND DOCUMENTATION PROVIDED UNDER THIS AGREEMENT, INCLUDING + BUT NOT LIMITED TO ANY WARRANTY OF MERCHANTABILITY OR FITNESS FOR A + PARTICULAR PURPOSE OR AGAINST INFRINGEMENT, OR ANY EXPRESS OR IMPLIED + WARRANTY ARISING OUT OF TRADE USAGE OR OUT OF A COURSE OF DEALING OR + COURSE OF PERFORMANCE. NOTHING CONTAINED IN THIS AGREEMENT SHALL BE + CONSTRUED AS A WARRANTY OR REPRESENTATION BY LICENSOR (I) AS TO THE + VALIDITY OR SCOPE OF ANY PATENT, COPYRIGHT OR OTHER INTELLECTUAL + PROPERTY RIGHT AND (II) THAT ANY MANUFACTURE OR USE WILL BE FREE FROM + INFRINGEMENT OF PATENTS, COPYRIGHTS OR OTHER INTELLECTUAL PROPERTY + RIGHTS OF OTHERS, AND IT SHALL BE THE SOLE RESPONSIBILITY OF YOU TO + MAKE SUCH DETERMINATION AS IS NECESSARY WITH RESPECT TO THE + ACQUISITION OF LICENSES UNDER PATENTS AND OTHER INTELLECTUAL PROPERTY + OF THIRD PARTIES. LICENSOR SHALL NOT HAVE ANY OBLIGATION TO PROVIDE + ANY TECHNICAL SUPPORT OF THE SOFTWARE UNDER THIS AGREEMENT. + + 7. Term and Termination + + a. This Agreement shall be effective on the date You accept this + Agreement and shall remain in effect until terminated as provided + herein. You may terminate the Agreement at any time by deleting and + destroying all copies of the Software and all related information in + Your possession or control. This Agreement terminates immediately and + automatically, with or without notice, if You fail to comply with any + provision hereof. Additionally, Licensor may at any time terminate + this Agreement, without cause, upon notice to You. Upon termination + You must delete or destroy all copies of the Software in Your + possession, and the license granted to You in this Agreement shall + terminate. Sections 3, 4, 5, 6 and 8 shall survive the termination of + this Agreement. + + 8. Miscellaneous + + a. Governing Law. This Agreement is governed and interpreted in + accordance with the laws of the State of California without giving + effect to its conflict of laws provisions. The United Nations + Convention on Contracts for the International Sale of Goods is + expressly disclaimed and shall not apply. Any claim arising out of or + related to this Agreement must be brought exclusively in a federal or + state court located in Santa Clara County, California and You consent + to the jurisdiction and venue of such courts. + + b. Waiver and Severability. The failure of either party to require + performance by the other party of any provision of this Agreement + shall not affect the full right to require such performance at any + time thereafter; nor shall the waiver by either party of a breach of + any provision of this Agreement be taken or held to be a waiver of + the provision itself. Severability. If any provision of this + Agreement is unenforceable or invalid under any applicable law or is + so held by applicable court decision, such unenforceability or + invalidity shall not render this Agreement unenforceable or invalid + as a whole, and such provision shall be changed and interpreted so as + to best accomplish the objectives of such unenforceable or invalid + provision within the limits of applicable law or applicable court + decisions. + + c. Amendment and Modification. This Agreement and any of its terms and + provisions may only be amended, modified, supplemented or waived in a + writing signed by both parties hereto. + + d. Compliance with Laws. You shall comply with all applicable laws, + rules, and regulations in connection with its activities under this + Agreement. + + e. Entire Agreement. This Agreement completely and exclusively states + the agreement between You and Licensor regarding this subject matter. -- cgit v1.1 From d309b7bd1443594b8c8f6d5feea0611cb317e103 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Queru Date: Wed, 4 Jul 2012 14:53:29 -0700 Subject: Prepare for JellyBean AOSP Change-Id: I7a3008cf17881550c1e1af3a8bf30816e3aa6d73 --- board-info.txt | 2 +- factory-images/generate-factory-images-package.sh | 23 +++++++++++++---------- self-extractors/generate-packages.sh | 5 +++-- 3 files changed, 17 insertions(+), 13 deletions(-) diff --git a/board-info.txt b/board-info.txt index bc59db1..232cbc0 100644 --- a/board-info.txt +++ b/board-info.txt @@ -3,4 +3,4 @@ # public. require board=tuna require version-bootloader=PRIMELA03|PRIMELC03 -require version-baseband=I9250XXLA2 +require version-baseband=I9250XXLA2|I9250XXLF1 diff --git a/factory-images/generate-factory-images-package.sh b/factory-images/generate-factory-images-package.sh index 3ba6e5a..e100167 100755 --- a/factory-images/generate-factory-images-package.sh +++ b/factory-images/generate-factory-images-package.sh @@ -19,21 +19,24 @@ # 235179 = ICL53F # 299849 = IMM76D # 330937 = IMM76I +# 397360 = JRO02C -BUILD=330937 +source ../../../common/clear-factory-images-variables.sh +BUILD=397360 DEVICE=maguro PRODUCT=yakju -VERSION=imm76i -BOOTLOADER=primela03 -RADIO=i9250xxla02 - +VERSION=jro02c +SRCPREFIX=signed- +BOOTLOADER=primelc03 +RADIO=i9250xxlf1 source ../../../common/generate-factory-images-common.sh -BUILD=330937 +source ../../../common/clear-factory-images-variables.sh +BUILD=397360 DEVICE=maguro PRODUCT=takju -VERSION=imm76i -BOOTLOADER=primela03 -RADIO=i9250xxla02 - +VERSION=jro02c +SRCPREFIX=signed- +BOOTLOADER=primelc03 +RADIO=i9250xxlf1 source ../../../common/generate-factory-images-common.sh diff --git a/self-extractors/generate-packages.sh b/self-extractors/generate-packages.sh index aa7e157..a5cc059 100755 --- a/self-extractors/generate-packages.sh +++ b/self-extractors/generate-packages.sh @@ -30,6 +30,7 @@ # 241580 = IRL89 # 241968 = IRM03 # 391496 = JRN83D +# 397816 = JRO03B # end jb-dev BRANCH=jb-dev if test $BRANCH=ics-mr1 @@ -39,8 +40,8 @@ then fi # ics-mr1 if test $BRANCH=jb-dev then - ZIP=yakju-ota-391496.zip - BUILD=jrn83d + ZIP=yakju-ota-397816.zip + BUILD=jro03b fi # jb-dev ROOTDEVICE=maguro DEVICE=maguro -- cgit v1.1 From d14174a56c6099f32adbfa11a2fdba4580c7ff96 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Queru Date: Wed, 4 Jul 2012 17:10:40 -0700 Subject: Update for JRO03C Change-Id: I3d3f3268052f87b63c258db73bcf653a23550f9c --- factory-images/generate-factory-images-package.sh | 9 +++++---- self-extractors/generate-packages.sh | 5 +++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/factory-images/generate-factory-images-package.sh b/factory-images/generate-factory-images-package.sh index e100167..98a4547 100755 --- a/factory-images/generate-factory-images-package.sh +++ b/factory-images/generate-factory-images-package.sh @@ -20,22 +20,23 @@ # 299849 = IMM76D # 330937 = IMM76I # 397360 = JRO02C +# 398337 = JRO03C source ../../../common/clear-factory-images-variables.sh -BUILD=397360 +BUILD=398337 DEVICE=maguro PRODUCT=yakju -VERSION=jro02c +VERSION=jro03c SRCPREFIX=signed- BOOTLOADER=primelc03 RADIO=i9250xxlf1 source ../../../common/generate-factory-images-common.sh source ../../../common/clear-factory-images-variables.sh -BUILD=397360 +BUILD=398337 DEVICE=maguro PRODUCT=takju -VERSION=jro02c +VERSION=jro03c SRCPREFIX=signed- BOOTLOADER=primelc03 RADIO=i9250xxlf1 diff --git a/self-extractors/generate-packages.sh b/self-extractors/generate-packages.sh index a5cc059..f4fffe5 100755 --- a/self-extractors/generate-packages.sh +++ b/self-extractors/generate-packages.sh @@ -31,6 +31,7 @@ # 241968 = IRM03 # 391496 = JRN83D # 397816 = JRO03B +# 398337 = JRO03C # end jb-dev BRANCH=jb-dev if test $BRANCH=ics-mr1 @@ -40,8 +41,8 @@ then fi # ics-mr1 if test $BRANCH=jb-dev then - ZIP=yakju-ota-397816.zip - BUILD=jro03b + ZIP=yakju-ota-398337.zip + BUILD=jro03c fi # jb-dev ROOTDEVICE=maguro DEVICE=maguro -- cgit v1.1 From 33c5f33c85c16a825ad3abdfab5ecc7b36b5305d Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Queru Date: Thu, 5 Jul 2012 14:29:46 -0700 Subject: Update board-info.txt Change-Id: I17e5b8cf0774136570601bfb2192fadded8b71ba --- board-info.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board-info.txt b/board-info.txt index bc59db1..232cbc0 100644 --- a/board-info.txt +++ b/board-info.txt @@ -3,4 +3,4 @@ # public. require board=tuna require version-bootloader=PRIMELA03|PRIMELC03 -require version-baseband=I9250XXLA2 +require version-baseband=I9250XXLA2|I9250XXLF1 -- cgit v1.1 From 8194bb9bd05ae4e41d3df68d37346937b9e9c487 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Queru Date: Fri, 20 Jul 2012 09:26:15 -0700 Subject: Strip board-info.txt for AOSP Change-Id: I5948210c1a1428ed9cb4f8a8319bfe43e0f76a44 --- board-info.txt | 5 ----- 1 file changed, 5 deletions(-) diff --git a/board-info.txt b/board-info.txt index 232cbc0..6fcd60b 100644 --- a/board-info.txt +++ b/board-info.txt @@ -1,6 +1 @@ -# This is the open-source version of board-info.txt; it should contain -# version of the radio and bootloader that are available to the -# public. require board=tuna -require version-bootloader=PRIMELA03|PRIMELC03 -require version-baseband=I9250XXLA2|I9250XXLF1 -- cgit v1.1 From 66027f354d9e9f4cdf1841e76959acc000b5c62b Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Queru Date: Fri, 20 Jul 2012 09:26:48 -0700 Subject: Strip board-info.txt for AOSP Change-Id: I477f3ae7a0677163766cb2129525e0227716f142 --- board-info.txt | 5 ----- 1 file changed, 5 deletions(-) diff --git a/board-info.txt b/board-info.txt index 232cbc0..6fcd60b 100644 --- a/board-info.txt +++ b/board-info.txt @@ -1,6 +1 @@ -# This is the open-source version of board-info.txt; it should contain -# version of the radio and bootloader that are available to the -# public. require board=tuna -require version-bootloader=PRIMELA03|PRIMELC03 -require version-baseband=I9250XXLA2|I9250XXLF1 -- cgit v1.1 From 2d7634ec8146d5df3f2c5b80a7492e544c8fbb4a Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Queru Date: Fri, 27 Jul 2012 12:51:06 -0700 Subject: Install fRom in the correct location Change-Id: If6a55560be55ad66e9866e18c585e8bd9aaeeb9b --- self-extractors/samsung/staging/proprietary/Android.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/self-extractors/samsung/staging/proprietary/Android.mk b/self-extractors/samsung/staging/proprietary/Android.mk index cd34265..26c42bc 100644 --- a/self-extractors/samsung/staging/proprietary/Android.mk +++ b/self-extractors/samsung/staging/proprietary/Android.mk @@ -22,7 +22,7 @@ LOCAL_MODULE_OWNER := samsung LOCAL_SRC_FILES := fRom LOCAL_MODULE_TAGS := optional LOCAL_MODULE_CLASS := EXECUTABLES -LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/bin +LOCAL_MODULE_PATH := $(TARGET_OUT)/bin include $(BUILD_PREBUILT) include $(CLEAR_VARS) -- cgit v1.1 From 06604ad149dcfb11134b3ddbdd6fb08d59e6e3fe Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Queru Date: Mon, 30 Jul 2012 12:27:55 -0700 Subject: Binaries for JRO03H Change-Id: Ic033177a552936458376ac31c8677d37cb88dc9f --- self-extractors/generate-packages.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/self-extractors/generate-packages.sh b/self-extractors/generate-packages.sh index f4fffe5..bda1b7f 100755 --- a/self-extractors/generate-packages.sh +++ b/self-extractors/generate-packages.sh @@ -32,6 +32,7 @@ # 391496 = JRN83D # 397816 = JRO03B # 398337 = JRO03C +# 405518 = JRO03H # end jb-dev BRANCH=jb-dev if test $BRANCH=ics-mr1 @@ -41,8 +42,8 @@ then fi # ics-mr1 if test $BRANCH=jb-dev then - ZIP=yakju-ota-398337.zip - BUILD=jro03c + ZIP=yakju-ota-405518.zip + BUILD=jro03h fi # jb-dev ROOTDEVICE=maguro DEVICE=maguro -- cgit v1.1 From 7bdc0062e6988f8aa60a0eea57413c59de40728d Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Queru Date: Sat, 4 Aug 2012 05:50:53 -0700 Subject: auto-generated blob list Bug: 4295425 Change-Id: I8be02b19e06a46cd99fd173b5753253fbe29560e --- proprietary-blobs.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/proprietary-blobs.txt b/proprietary-blobs.txt index 33f28c4..f78c482 100644 --- a/proprietary-blobs.txt +++ b/proprietary-blobs.txt @@ -26,6 +26,7 @@ /system/vendor/lib/egl/libGLESv2_POWERVR_SGX540_120.so /system/vendor/lib/hw/gps.omap4.so /system/vendor/lib/hw/gralloc.omap4.so +/system/vendor/lib/libbt-vendor.so /system/vendor/lib/libglslcompiler.so /system/vendor/lib/libIMGegl.so /system/vendor/lib/libinvensense_mpl.so -- cgit v1.1 From 31bd5f37cf35321f83c2bff3e88f16c9d73d14de Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Queru Date: Tue, 7 Aug 2012 16:27:43 -0700 Subject: auto-generated blob list Bug: 4295425 Change-Id: I11ac910c5b69f3c0aa08802b875426933e4cc0e1 --- proprietary-blobs.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/proprietary-blobs.txt b/proprietary-blobs.txt index f78c482..25fa979 100644 --- a/proprietary-blobs.txt +++ b/proprietary-blobs.txt @@ -15,6 +15,7 @@ # This file is generated by device/common/generate-blob-lists.sh - DO NOT EDIT /system/bin/fRom +/system/lib/libdrmdecrypt.so /system/lib/libsecril-client.so /system/vendor/bin/pvrsrvctl /system/vendor/etc/sirfgps.conf -- cgit v1.1 From fb28402cf219bd46881ad4a788c957f6defbedbe Mon Sep 17 00:00:00 2001 From: Wink Saville Date: Mon, 20 Aug 2012 16:27:28 -0700 Subject: Add support for per device bluetooth configuration. Bug: 6837125 Change-Id: Ief08fc116ab644e8c4f8668008561117b51a8956 --- BoardConfig.mk | 8 ++++---- bluetooth/bdroid_buildcfg.h | 22 ++++++++++++++++++++++ 2 files changed, 26 insertions(+), 4 deletions(-) create mode 100644 bluetooth/bdroid_buildcfg.h diff --git a/BoardConfig.mk b/BoardConfig.mk index 9f9d389..2e739d5 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -12,13 +12,13 @@ # See the License for the specific language governing permissions and # limitations under the License. +# Default values, possibly overridden by BoardConfigVendor.mk +TARGET_BOARD_INFO_FILE := device/samsung/maguro/board-info.txt +BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := device/samsung/maguro/bluetooth + # Use the non-open-source part, if present -include vendor/samsung/maguro/BoardConfigVendor.mk -# Use the open-source board-info file if none was set by the vendor -# config. -TARGET_BOARD_INFO_FILE ?= device/samsung/maguro/board-info.txt - # Use the part that is common between all tunas include device/samsung/tuna/BoardConfig.mk diff --git a/bluetooth/bdroid_buildcfg.h b/bluetooth/bdroid_buildcfg.h new file mode 100644 index 0000000..5c61b6c --- /dev/null +++ b/bluetooth/bdroid_buildcfg.h @@ -0,0 +1,22 @@ +/* + * Copyright (C) 2012 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef _BDROID_BUILDCFG_H +#define _BDROID_BUILDCFG_H + +#define BTM_DEF_LOCAL_NAME "Galaxy Nexus 2" + +#endif -- cgit v1.1 From 76060f0a5beebb068cd118641430f2060647361b Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Queru Date: Fri, 7 Sep 2012 08:44:54 -0700 Subject: auto-generated blob list Bug: 4295425 Change-Id: I7adeace4e62d1fb456f42f563dd34ff92a0b066a --- proprietary-blobs.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/proprietary-blobs.txt b/proprietary-blobs.txt index 25fa979..09765bd 100644 --- a/proprietary-blobs.txt +++ b/proprietary-blobs.txt @@ -14,8 +14,14 @@ # This file is generated by device/common/generate-blob-lists.sh - DO NOT EDIT +/system/app/Gallery2.apk +/system/app/Nfc.apk /system/bin/fRom +/system/etc/updatecmds/migrate_nfc.txt /system/lib/libdrmdecrypt.so +/system/lib/libjni_eglfence.so +/system/lib/libjni_mosaic.so +/system/lib/libnfc_jni.so /system/lib/libsecril-client.so /system/vendor/bin/pvrsrvctl /system/vendor/etc/sirfgps.conf -- cgit v1.1 From be1d47771bd0c1ecc8191458d479c901a76004a4 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Queru Date: Thu, 13 Sep 2012 09:26:01 -0700 Subject: Self-extractors for JZO54G Change-Id: I12c8448177c0cc30d5c145f2b861be696f9b10aa --- self-extractors/generate-packages.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/self-extractors/generate-packages.sh b/self-extractors/generate-packages.sh index bda1b7f..dd9e184 100755 --- a/self-extractors/generate-packages.sh +++ b/self-extractors/generate-packages.sh @@ -33,6 +33,7 @@ # 397816 = JRO03B # 398337 = JRO03C # 405518 = JRO03H +# 463694 = JZO54G # end jb-dev BRANCH=jb-dev if test $BRANCH=ics-mr1 @@ -42,8 +43,8 @@ then fi # ics-mr1 if test $BRANCH=jb-dev then - ZIP=yakju-ota-405518.zip - BUILD=jro03h + ZIP=yakju-ota-463694.zip + BUILD=jzo54g fi # jb-dev ROOTDEVICE=maguro DEVICE=maguro -- cgit v1.1 From ad1407c77cb3db23e2e38082e49dedae81632366 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Queru Date: Thu, 13 Sep 2012 13:46:01 -0700 Subject: Update self-extractors for JOO75 Change-Id: Ia48586ac1cb66bcaac9342aac2d5e6c30dfa5089 --- self-extractors/broadcom/staging/device-partial.mk | 3 +- .../broadcom/staging/proprietary/Android.mk | 10 + self-extractors/generate-packages.sh | 18 +- self-extractors/root/BoardConfigVendor.mk | 1 + self-extractors/root/device-vendor.mk | 1 + self-extractors/widevine/COPYRIGHT | 1 + self-extractors/widevine/LICENSE | 218 +++++++++++++++++++++ .../widevine/staging/BoardConfigPartial.mk | 13 ++ self-extractors/widevine/staging/device-partial.mk | 17 ++ .../widevine/staging/proprietary/Android.mk | 29 +++ 10 files changed, 308 insertions(+), 3 deletions(-) create mode 100644 self-extractors/widevine/COPYRIGHT create mode 100644 self-extractors/widevine/LICENSE create mode 100644 self-extractors/widevine/staging/BoardConfigPartial.mk create mode 100644 self-extractors/widevine/staging/device-partial.mk create mode 100644 self-extractors/widevine/staging/proprietary/Android.mk diff --git a/self-extractors/broadcom/staging/device-partial.mk b/self-extractors/broadcom/staging/device-partial.mk index 118c94a..21dd77f 100644 --- a/self-extractors/broadcom/staging/device-partial.mk +++ b/self-extractors/broadcom/staging/device-partial.mk @@ -14,4 +14,5 @@ # Broadcom blob(s) necessary for Maguro hardware PRODUCT_PACKAGES := \ - bcm4330 + bcm4330 \ + libbt-vendor diff --git a/self-extractors/broadcom/staging/proprietary/Android.mk b/self-extractors/broadcom/staging/proprietary/Android.mk index 888c48f..b7ca827 100644 --- a/self-extractors/broadcom/staging/proprietary/Android.mk +++ b/self-extractors/broadcom/staging/proprietary/Android.mk @@ -26,4 +26,14 @@ LOCAL_MODULE_CLASS := ETC LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/firmware include $(BUILD_PREBUILT) +include $(CLEAR_VARS) +LOCAL_MODULE := libbt-vendor +LOCAL_MODULE_OWNER := broadcom +LOCAL_SRC_FILES := libbt-vendor.so +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_SUFFIX := .so +LOCAL_MODULE_CLASS := SHARED_LIBRARIES +LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_SHARED_LIBRARIES) +include $(BUILD_PREBUILT) + endif diff --git a/self-extractors/generate-packages.sh b/self-extractors/generate-packages.sh index dd9e184..3ec8cca 100755 --- a/self-extractors/generate-packages.sh +++ b/self-extractors/generate-packages.sh @@ -35,7 +35,10 @@ # 405518 = JRO03H # 463694 = JZO54G # end jb-dev -BRANCH=jb-dev +# start jb-mr1-dev +# 465036 = JOO75 +# end jb-mr1-dev +BRANCH=jb-mr1-dev if test $BRANCH=ics-mr1 then ZIP=yakju-ota-299849.zip @@ -46,11 +49,16 @@ then ZIP=yakju-ota-463694.zip BUILD=jzo54g fi # jb-dev +if test $BRANCH=jb-mr1-dev +then + ZIP=yakju-ota-465036.zip + BUILD=joo75 +fi # jb-dev ROOTDEVICE=maguro DEVICE=maguro MANUFACTURER=samsung -for COMPANY in broadcom csr imgtec invensense nxp samsung ti +for COMPANY in broadcom csr imgtec invensense nxp samsung ti widevine do echo Processing files from $COMPANY rm -rf tmp @@ -61,6 +69,7 @@ do broadcom) TO_EXTRACT="\ system/vendor/firmware/bcm4330.hcd \ + system/vendor/lib/libbt-vendor.so \ " ;; csr) @@ -108,6 +117,11 @@ do system/vendor/firmware/ducati-m3.bin \ " ;; + widevine) + TO_EXTRACT="\ + system/lib/libdrmdecrypt.so \ + " + ;; esac echo \ \ Extracting files from OTA package for ONE_FILE in $TO_EXTRACT diff --git a/self-extractors/root/BoardConfigVendor.mk b/self-extractors/root/BoardConfigVendor.mk index ca10d74..7a62051 100644 --- a/self-extractors/root/BoardConfigVendor.mk +++ b/self-extractors/root/BoardConfigVendor.mk @@ -21,3 +21,4 @@ LOCAL_STEM := maguro/BoardConfigPartial.mk -include vendor/nxp/$(LOCAL_STEM) -include vendor/samsung/$(LOCAL_STEM) -include vendor/ti/$(LOCAL_STEM) +-include vendor/widevine/$(LOCAL_STEM) diff --git a/self-extractors/root/device-vendor.mk b/self-extractors/root/device-vendor.mk index 833cbcd..a6187df 100644 --- a/self-extractors/root/device-vendor.mk +++ b/self-extractors/root/device-vendor.mk @@ -21,3 +21,4 @@ $(call inherit-product-if-exists, vendor/invensense/$(LOCAL_STEM)) $(call inherit-product-if-exists, vendor/nxp/$(LOCAL_STEM)) $(call inherit-product-if-exists, vendor/samsung/$(LOCAL_STEM)) $(call inherit-product-if-exists, vendor/ti/$(LOCAL_STEM)) +$(call inherit-product-if-exists, vendor/widevine/$(LOCAL_STEM)) diff --git a/self-extractors/widevine/COPYRIGHT b/self-extractors/widevine/COPYRIGHT new file mode 100644 index 0000000..db593ae --- /dev/null +++ b/self-extractors/widevine/COPYRIGHT @@ -0,0 +1 @@ +# (C) Google Inc. diff --git a/self-extractors/widevine/LICENSE b/self-extractors/widevine/LICENSE new file mode 100644 index 0000000..11f8237 --- /dev/null +++ b/self-extractors/widevine/LICENSE @@ -0,0 +1,218 @@ +THIS DEVELOPER SOFTWARE LICENSE AGREEMENT (THE "AGREEMENT") IS A LEGALLY +BINDING AGREEMENT BETWEEN Google Inc. ("LICENSOR") AND +YOU OR THE LEGAL ENTITY YOU REPRESENT ("You" or its possessive, "Your"). BY +TYPING "I ACCEPT" WHERE INDICATED YOU ACKNOWLEDGE THAT YOU HAVE READ THIS +AGREEMENT, UNDERSTAND IT AND AGREE TO BE BOUND BY ITS TERMS AND CONDITIONS. IF +YOU DO NOT AGREE TO THESE TERMS YOU MUST DISCONTINUE THE INSTALLATION PROCESS +AND YOU SHALL NOT USE THE SOFTWARE OR RETAIN ANY COPIES OF THE SOFTWARE OR +DOCUMENTATION. ANY USE OR POSSESSION OF THE SOFTWARE BY YOU IS SUBJECT TO THE +TERMS AND CONDITIONS SET FORTH IN THIS AGREEMENT. IF THE SOFTWARE IS INSTALLED +ON A COMPUTER OWNED BY A CORPORATION OR OTHER LEGAL ENTITY, THEN YOU REPRESENT +AND WARRANT THAT YOU HAVE THE AUTHORITY TO BIND SUCH ENTITY TO THE TERMS AND +CONDITIONS OF THIS AGREEMENT. + + 1. Special Definitions + + a. The term "Android" means the open source mobile platform, software + stack, operating system, middleware, application programming + interfaces and mobile applications under the trade-name "Android" + distributed at Android.com. + + b. The term "Android Applications" means a software application or + open-source contribution developed by You, designed to operate with + Android that does not contain or incorporate any of the Software. + + c. The term "Authorized Android Enabled Device" means only the device + identified on the site from which You downloaded the Software. + The term "Software" means the Licensor's proprietary software and + libraries in object code form, designed for use on the Authorized + Android Enabled Device. + + d. The term "Authorized Android Enabled Device Software" means a + packaged build for Authorized Android Enabled Devices, consisting of + files suitable for installation on an Authorized Android Enabled + Device using a mechanism such as fastboot mode or recovery mode. + + 2. License Grant + + a. Subject to the terms of this Agreement, Licensor hereby grants to + You, free of charge, a non-exclusive, non-sublicensable, + non-transferable, limited license, during the term of this Agreement, + to download, install and use the Software internally in + machine-readable (i.e., object code) form and the Documentation for + non-commercial use on an Authorized Android Enabled Device and + non-commercial redistribution of the Authorized Android Enabled + Device Software (the "Limited Purpose"). You may grant your end users + the right to use the Software for the Limited Purpose. The license to + the Software granted to You hereunder is solely for the Limited + Purpose set forth in this section, and the Software shall not be used + for any other purpose. + + 3. Restrictions + + a. Retention of Rights. The entire right, title and interest in the + Software shall remain with Licensor and, unless specified in writing + hereunder, no rights are granted to any of the Software. Except for + the right to use the Software for the Limited Purpose, the delivery + of the Software to You does not convey to You any intellectual + property rights in the Software, including, but not limited to any + rights under any patent, trademark, copyright, or trade secret. + Neither the delivery of the Software to You nor any terms set forth + herein shall be construed to grant to You, either expressly, by + implication or by way of estoppel, any license under any patents or + other intellectual property rights covering or relating to any other + product or invention or any combination of the Software with any + other product. Any rights not expressly granted to You herein are + reserved by Licensor. + + b. No Commercialization or Distribution of the Software and + Documentation. Except as expressly provided in Section 2 of this + Agreement, You shall have no right to (i) copy, disclose, distribute, + publically perform, publically display, transfer, alter, modify, + translate, disassemble, decompile, reverse engineer, or adapt the + Software and Documentation, or any portion thereof, or create any + derivative works based thereon; (ii) rent, lease, assign, sublicense, + resell, disclose or otherwise transfer the Software and Documentation + in whole or in part to any third party (iii) use the Software and + Documentation except for the Limited Purpose, (iv) remove or alter + any of the copyright or proprietary notices contained in any of the + Software and Documentation. For the purposes of clarity, nothing in + this Agreement prohibits You from making and distributing Android + Applications under commercial or non-commercial terms, provided that + You shall not contain, incorporate, and/or compile the Software or + any of its derivative works, in whole or in part, into Your Android + Applications and/or any software/devices created by You or by third + parties acting on Your behalf. You and any such third party shall + comply with all of the terms and conditions of this Agreement. + + c. No Reverse Engineering. Except for any portions of the Software + provided to You in source code format and except for any third party + code distributed with the Software that is licensed under contrary + terms, You will not reverse engineer, disassemble, + decompile, or translate the Software, or otherwise attempt to derive + the source code version of the Software, except if and to the extent + expressly permitted under any applicable law. + + d. Third Party Software. You agree that Android may contain third party + software. You agree that you may not distribute such third party + software for any purpose without appropriate licenses from the + applicable third party or parties. + + e. No Transfer or Assignment. You shall not assign any of its rights or + obligations under this Agreement. Any attempted assignment in + contravention of this Section shall be void. + + 4. Indemnity + + a. You agree to indemnify and hold harmless Licensor and its officers, + directors, customers, employees and successors and assigns (each an + "Indemnified Party") against any and all claims, demands, causes of + action, losses, liabilities, damages, costs and expenses, incurred by + the Indemnified Party (including but not limited to costs of defense, + investigation and reasonable attorney's fees) arising out of, + resulting from or related to (i) any software, products, + documentation, content, materials or derivative works created or + developed by You using the Software which causes an infringement of + any patent, copyright, trademark, trade secret, or other property, + publicity or privacy rights of any third parties arising in any + jurisdiction anywhere in the world, (ii) the download, distribution, + installation, storage, execution, use or transfer of such software, + products, documentation, content, materials or derivative works by + any person or entity, and/or (iii) any breach of this Agreement by + You. If requested by an Indemnified Party, You agree to defend such + Indemnified Party in connection with any third party claims, demands, + or causes of action resulting from, arising out of or in connection + with any of the foregoing. + + 5. Limitation of Liability + + a. TO THE MAXIMUM EXTENT PERMITTED UNDER APPLICABLE LAWS, UNDER NO + CIRCUMSTANCES, INCLUDING WITHOUT LIMITATION NEGLIGENCE, SHALL + LICENSOR, ITS AFFILIATES AND/OR ITS DIRECTORS, OFFICERS, EMPLOYEES OR + AGENTS BE LIABLE FOR ANY INDIRECT, INCIDENTAL, SPECIAL, PUNITIVE OR + CONSEQUENTIAL DAMAGES (INCLUDING BUT NOT LIMITED TO DAMAGES FOR LOSS + OF BUSINESS PROFITS, BUSINESS INTERRUPTION, LOSS OF BUSINESS + INFORMATION AND THE LIKE) ARISING OUT OF OR IN CONNECTION WITH THE + SOFTWARE OR ANY DOWNLOAD, INSTALLATION OR USE OF, OR INABILITY TO + USE, THE SOFTWARE, EVEN IF LICENSOR HAS BEEN ADVISED OF THE + POSSIBILITY OF SUCH DAMAGES. SOME JURISDICTIONS DO NOT ALLOW THE + LIMITATION OR EXCLUSION OF LIABILITY FOR INCIDENTAL OR CONSEQUENTIAL + DAMAGES SO THE ABOVE LIMITATION OR EXCLUSION MAY NOT APPLY OR MAY BE + LIMITED. IN NO EVENT SHALL LICENSOR'S TOTAL AGGREGATE LIABILITY TO + YOU FOR ANY AND ALL DAMAGES, LOSSES, CLAIMS AND CAUSES OF ACTIONS + (WHETHER IN CONTRACT, TORT, INCLUDING NEGLIGENCE, INDEMNIFICATION OR + OTHERWISE) EXCEED ONE HUNDRED U.S. DOLLARS (US$100). THE LIMITATIONS + SET FORTH IN THIS PARAGRAPH SHALL BE DEEMED TO APPLY TO THE MAXIMUM + EXTENT PERMITTED BY APPLICABLE LAW. THE PARTIES HAVE FULLY CONSIDERED + THE FOREGOING ALLOCATION OF RISK AND FIND IT REASONABLE, AND THAT THE + FOREGOING LIMITATIONS IN THIS PARAGRAPH ARE AN ESSENTIAL BASIS OF + THE BARGAIN BETWEEN THE PARTIES. + + 6. No Warranty + + a. LICENSOR MAKES NO WARRANTIES, EXPRESS OR IMPLIED, WITH RESPECT TO THE + SOFTWARE AND DOCUMENTATION PROVIDED UNDER THIS AGREEMENT, INCLUDING + BUT NOT LIMITED TO ANY WARRANTY OF MERCHANTABILITY OR FITNESS FOR A + PARTICULAR PURPOSE OR AGAINST INFRINGEMENT, OR ANY EXPRESS OR IMPLIED + WARRANTY ARISING OUT OF TRADE USAGE OR OUT OF A COURSE OF DEALING OR + COURSE OF PERFORMANCE. NOTHING CONTAINED IN THIS AGREEMENT SHALL BE + CONSTRUED AS A WARRANTY OR REPRESENTATION BY LICENSOR (I) AS TO THE + VALIDITY OR SCOPE OF ANY PATENT, COPYRIGHT OR OTHER INTELLECTUAL + PROPERTY RIGHT AND (II) THAT ANY MANUFACTURE OR USE WILL BE FREE FROM + INFRINGEMENT OF PATENTS, COPYRIGHTS OR OTHER INTELLECTUAL PROPERTY + RIGHTS OF OTHERS, AND IT SHALL BE THE SOLE RESPONSIBILITY OF YOU TO + MAKE SUCH DETERMINATION AS IS NECESSARY WITH RESPECT TO THE + ACQUISITION OF LICENSES UNDER PATENTS AND OTHER INTELLECTUAL PROPERTY + OF THIRD PARTIES. LICENSOR SHALL NOT HAVE ANY OBLIGATION TO PROVIDE + ANY TECHNICAL SUPPORT OF THE SOFTWARE UNDER THIS AGREEMENT. + + 7. Term and Termination + + a. This Agreement shall be effective on the date You accept this + Agreement and shall remain in effect until terminated as provided + herein. You may terminate the Agreement at any time by deleting and + destroying all copies of the Software and all related information in + Your possession or control. This Agreement terminates immediately and + automatically, with or without notice, if You fail to comply with any + provision hereof. Additionally, Licensor may at any time terminate + this Agreement, without cause, upon notice to You. Upon termination + You must delete or destroy all copies of the Software in Your + possession, and the license granted to You in this Agreement shall + terminate. Sections 3, 4, 5, 6 and 8 shall survive the termination of + this Agreement. + + 8. Miscellaneous + + a. Governing Law. This Agreement is governed and interpreted in + accordance with the laws of the State of California without giving + effect to its conflict of laws provisions. The United Nations + Convention on Contracts for the International Sale of Goods is + expressly disclaimed and shall not apply. Any claim arising out of or + related to this Agreement must be brought exclusively in a federal or + state court located in Santa Clara County, California and You consent + to the jurisdiction and venue of such courts. + + b. Waiver and Severability. The failure of either party to require + performance by the other party of any provision of this Agreement + shall not affect the full right to require such performance at any + time thereafter; nor shall the waiver by either party of a breach of + any provision of this Agreement be taken or held to be a waiver of + the provision itself. Severability. If any provision of this + Agreement is unenforceable or invalid under any applicable law or is + so held by applicable court decision, such unenforceability or + invalidity shall not render this Agreement unenforceable or invalid + as a whole, and such provision shall be changed and interpreted so as + to best accomplish the objectives of such unenforceable or invalid + provision within the limits of applicable law or applicable court + decisions. + + c. Amendment and Modification. This Agreement and any of its terms and + provisions may only be amended, modified, supplemented or waived in a + writing signed by both parties hereto. + + d. Compliance with Laws. You shall comply with all applicable laws, + rules, and regulations in connection with its activities under this + Agreement. + + e. Entire Agreement. This Agreement completely and exclusively states + the agreement between You and Licensor regarding this subject matter. diff --git a/self-extractors/widevine/staging/BoardConfigPartial.mk b/self-extractors/widevine/staging/BoardConfigPartial.mk new file mode 100644 index 0000000..01a0ff3 --- /dev/null +++ b/self-extractors/widevine/staging/BoardConfigPartial.mk @@ -0,0 +1,13 @@ +# Copyright (C) 2010 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. diff --git a/self-extractors/widevine/staging/device-partial.mk b/self-extractors/widevine/staging/device-partial.mk new file mode 100644 index 0000000..649264c --- /dev/null +++ b/self-extractors/widevine/staging/device-partial.mk @@ -0,0 +1,17 @@ +# Copyright (C) 2010 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# Widevine blob(s) necessary for Maguro hardware +PRODUCT_PACKAGES := \ + libdrmdecrypt diff --git a/self-extractors/widevine/staging/proprietary/Android.mk b/self-extractors/widevine/staging/proprietary/Android.mk new file mode 100644 index 0000000..46500ce --- /dev/null +++ b/self-extractors/widevine/staging/proprietary/Android.mk @@ -0,0 +1,29 @@ +# Copyright (C) 2011 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +LOCAL_PATH := $(call my-dir) + +ifeq ($(TARGET_DEVICE),maguro) + +include $(CLEAR_VARS) +LOCAL_MODULE := libdrmdecrypt +LOCAL_SRC_FILES := libdrmdecrypt.so +LOCAL_MODULE_SUFFIX := .so +LOCAL_MODULE_CLASS := SHARED_LIBRARIES +LOCAL_MODULE_PATH := $(TARGET_OUT)/lib +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_OWNER := widevine +include $(BUILD_PREBUILT) + +endif -- cgit v1.1 From 8b99d895f317111d52f8d839000aabec350ab606 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Queru Date: Thu, 13 Sep 2012 15:19:29 -0700 Subject: Fix typo Change-Id: I77a9f99be2481eb43405abf56fe6a301dfe35d49 --- self-extractors/generate-packages.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/self-extractors/generate-packages.sh b/self-extractors/generate-packages.sh index 3ec8cca..5db2446 100755 --- a/self-extractors/generate-packages.sh +++ b/self-extractors/generate-packages.sh @@ -53,7 +53,7 @@ if test $BRANCH=jb-mr1-dev then ZIP=yakju-ota-465036.zip BUILD=joo75 -fi # jb-dev +fi # jb-mr1-dev ROOTDEVICE=maguro DEVICE=maguro MANUFACTURER=samsung -- cgit v1.1 From 8b36c34909f0ec3908b6f2cd613cd61682293b04 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Queru Date: Mon, 17 Sep 2012 14:47:58 -0700 Subject: auto-generated blob list Bug: 4295425 Change-Id: Ic19c6b97b11e5843d7584474a49cdf9be69fb5f3 --- proprietary-blobs.txt | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/proprietary-blobs.txt b/proprietary-blobs.txt index 09765bd..3ffd067 100644 --- a/proprietary-blobs.txt +++ b/proprietary-blobs.txt @@ -14,10 +14,18 @@ # This file is generated by device/common/generate-blob-lists.sh - DO NOT EDIT +/system/app/Bluetooth.apk /system/app/Gallery2.apk /system/app/Nfc.apk /system/bin/fRom +/system/etc/bluetooth/auto_pair_devlist.conf +/system/etc/bluetooth/bt_did.conf +/system/etc/bluetooth/bt_stack.conf /system/etc/updatecmds/migrate_nfc.txt +/system/lib/hw/audio.a2dp.default.so +/system/lib/hw/bluetooth.default.so +/system/lib/libbluetooth_jni.so +/system/lib/libbt-hci.so /system/lib/libdrmdecrypt.so /system/lib/libjni_eglfence.so /system/lib/libjni_mosaic.so -- cgit v1.1 From 73be3ba687db08252e8fe10dac049599d506f821 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Queru Date: Thu, 20 Sep 2012 02:43:37 -0700 Subject: auto-generated blob list Bug: 4295425 Change-Id: I8e58f773668731650b11a45660f8071fe03a92ba --- proprietary-blobs.txt | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/proprietary-blobs.txt b/proprietary-blobs.txt index 3ffd067..25fa979 100644 --- a/proprietary-blobs.txt +++ b/proprietary-blobs.txt @@ -14,22 +14,8 @@ # This file is generated by device/common/generate-blob-lists.sh - DO NOT EDIT -/system/app/Bluetooth.apk -/system/app/Gallery2.apk -/system/app/Nfc.apk /system/bin/fRom -/system/etc/bluetooth/auto_pair_devlist.conf -/system/etc/bluetooth/bt_did.conf -/system/etc/bluetooth/bt_stack.conf -/system/etc/updatecmds/migrate_nfc.txt -/system/lib/hw/audio.a2dp.default.so -/system/lib/hw/bluetooth.default.so -/system/lib/libbluetooth_jni.so -/system/lib/libbt-hci.so /system/lib/libdrmdecrypt.so -/system/lib/libjni_eglfence.so -/system/lib/libjni_mosaic.so -/system/lib/libnfc_jni.so /system/lib/libsecril-client.so /system/vendor/bin/pvrsrvctl /system/vendor/etc/sirfgps.conf -- cgit v1.1 From bd5129012724fbe6c3ac3583156ba99de2f78495 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Queru Date: Thu, 20 Sep 2012 15:07:42 -0700 Subject: Remove version requirements for AOSP Change-Id: I9e3167c2ffa8586cf50bce47400a1b2473d005ae --- board-info.txt | 5 ----- 1 file changed, 5 deletions(-) diff --git a/board-info.txt b/board-info.txt index bc59db1..6fcd60b 100644 --- a/board-info.txt +++ b/board-info.txt @@ -1,6 +1 @@ -# This is the open-source version of board-info.txt; it should contain -# version of the radio and bootloader that are available to the -# public. require board=tuna -require version-bootloader=PRIMELA03|PRIMELC03 -require version-baseband=I9250XXLA2 -- cgit v1.1 From 7464c1fa93f348f3f4fc8906e7cb8ecc65e5f0f8 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Queru Date: Fri, 21 Sep 2012 10:54:53 -0700 Subject: Self-extractors for JRO03R binaries for maguro Change-Id: Idf7f8fb5088b13622a312705821cc296e5393e1b --- self-extractors/generate-packages.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/self-extractors/generate-packages.sh b/self-extractors/generate-packages.sh index bda1b7f..70ddbc8 100755 --- a/self-extractors/generate-packages.sh +++ b/self-extractors/generate-packages.sh @@ -33,6 +33,7 @@ # 397816 = JRO03B # 398337 = JRO03C # 405518 = JRO03H +# 438695 = JRO03R # end jb-dev BRANCH=jb-dev if test $BRANCH=ics-mr1 @@ -42,8 +43,8 @@ then fi # ics-mr1 if test $BRANCH=jb-dev then - ZIP=yakju-ota-405518.zip - BUILD=jro03h + ZIP=yakju-ota-438695.zip + BUILD=jro03r fi # jb-dev ROOTDEVICE=maguro DEVICE=maguro -- cgit v1.1 From c93fe3ee8e58c2dbd27b1f82a7dfdc7b040e4244 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Queru Date: Thu, 11 Oct 2012 09:35:33 -0700 Subject: auto-generated blob list Bug: 4295425 Change-Id: I244f090664886b418a4661ac3e9fd8574fbefc4f --- proprietary-blobs.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/proprietary-blobs.txt b/proprietary-blobs.txt index 25fa979..e9a7153 100644 --- a/proprietary-blobs.txt +++ b/proprietary-blobs.txt @@ -27,7 +27,6 @@ /system/vendor/lib/egl/libGLESv2_POWERVR_SGX540_120.so /system/vendor/lib/hw/gps.omap4.so /system/vendor/lib/hw/gralloc.omap4.so -/system/vendor/lib/libbt-vendor.so /system/vendor/lib/libglslcompiler.so /system/vendor/lib/libIMGegl.so /system/vendor/lib/libinvensense_mpl.so -- cgit v1.1