StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,548 Commits 1 Branch 0 Tags
116c59bbb7220c64d362d55463083b51db2f687c
Commit Graph

10548 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
The Android Automerger
7e6e7d85d4 JOO87C 2012-09-25 14:43:33 -07:00
The Android Automerger
d6c869beb9 JOO87B 2012-09-25 11:06:38 -07:00
The Android Automerger
95ea2465e1 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-25 11:05:45 -07:00
The Android Automerger
e128d8d9bd JOO87 2012-09-25 07:02:05 -07:00
The Android Automerger
12c00968a3 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-25 06:59:14 -07:00
The Android Automerger
00a95f3b9a JOO86B 2012-09-24 16:47:29 -07:00
Bart Sears
0b7e0983d4 Merge "Add the new NanumGothic makefile to the build" into jb-mr1-dev 2012-09-24 13:06:06 -07:00
Siva Velusamy
53e714209b Revert "Include videoeditor_jni in sdk product build." 
This reverts commit 997e629d6d.
 2012-09-24 10:24:17 -07:00
The Android Open Source Project
cc71f1ea0b am d50926a0: (-s ours) Reconcile with jb-mr0-release - do not merge 
* commit 'd50926a047d51f950cbe6c7588d4b168e0cfc3bb':
  JZO54H
 2012-09-24 08:26:41 -07:00
The Android Open Source Project
d50926a047 Reconcile with jb-mr0-release - do not merge 
Change-Id: I41bb7c5875f0eef1fd8c31f98f628718a966eddc
 2012-09-24 07:38:53 -07:00
The Android Automerger
6554982614 JOO86 2012-09-24 06:59:50 -07:00
The Android Automerger
89e87cca0d merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-24 06:59:02 -07:00
Bart Sears
04873af062 Add the new NanumGothic makefile to the build 
There are separate CLs to add the NanumGothic font files
and makefiles.

Bug: 4531601
Change-Id: Id27f9ff6eb45f666f7f62f1dbe7a06c96c0a717e
 2012-09-24 00:11:00 -07:00
The Android Automerger
1601c69db8 JOO85B 2012-09-23 19:00:36 -07:00
The Android Automerger
ebfd60e107 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-23 18:59:34 -07:00
Ying Wang
f8f2b022e9 Ignore support library Proguard warning 
The support library contains references to newer platform versions.
Don't warn about those in case this app is linking against an older
platform version.  We know about them, and they are safe.

Change-Id: Ia2a90398b1db1858d005ec09ded56751cc6ffb00
 2012-09-23 13:46:58 -07:00
The Android Automerger
6be506fb58 JOO85 2012-09-23 06:59:48 -07:00
The Android Automerger
0a7f5a7973 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-23 06:59:04 -07:00
The Android Automerger
bee64ff377 JOO84 2012-09-22 09:44:00 -07:00
The Android Automerger
98f9d314a2 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-22 09:41:22 -07:00
The Android Automerger
b097af8279 JZO54H 2012-09-21 18:02:14 -07:00
The Android Automerger
57b9a0da06 JOO83C 2012-09-21 16:26:24 -07:00
Siva Velusamy
7ede0cfc15 Include videoeditor_jni in sdk product build. 
frameworks/base/media depends on libvideoeditor_jni. This change
copies the dependencies from generic_no_telephony.mk

Fixes Bug 7200384

Change-Id: I135fd4fc613d81aa962bcdf2573894a2ea8ab11d
 2012-09-21 15:42:50 -07:00
The Android Automerger
ee6f5491b5 JOO83B 2012-09-21 15:40:59 -07:00
Siva Velusamy
32130c6d09 Merge "Include videoeditor_jni in sdk product build." into jb-mr1-dev 2012-09-21 15:00:28 -07:00
Scott Main
57a0a4c1fe am dcce7ca6: am 582db97b: add style for code captions; ignore sidenav headers for HRs 
* commit 'dcce7ca6a82cf08a7047d0fd23ba05b47be831c1':
  add style for code captions; ignore sidenav headers for HRs
 2012-09-21 14:56:35 -07:00
Scott Main
dcce7ca6a8 am 582db97b: add style for code captions; ignore sidenav headers for HRs 
* commit '582db97b23982f8e9cac7926ac3f5806b6a9cc71':
  add style for code captions; ignore sidenav headers for HRs
 2012-09-21 14:54:09 -07:00
Scott Main
582db97b23 add style for code captions; 
ignore sidenav headers for HRs

Change-Id: I6eb11d3629dd13d2c7ac297cc9fa3828ed59f170
 2012-09-21 14:33:43 -07:00
Siva Velusamy
997e629d6d Include videoeditor_jni in sdk product build. 
frameworks/base/media depends on libvideoeditor_jni. This change
copies the dependencies from generic_no_telephony.mk

Fixes Bug 7200384

Change-Id: I135fd4fc613d81aa962bcdf2573894a2ea8ab11d
 2012-09-21 14:23:50 -07:00
The Android Automerger
9fcb198c70 JOO83 2012-09-21 07:01:59 -07:00
The Android Automerger
c1e962bc59 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-21 06:59:15 -07:00
Keun young Park
320b94d030 fix PDK build 
- build tools not coming from prebuilts for PDK

Change-Id: I5760a54f502b8aa2167976c8f1e17412f31c6f5f
 2012-09-20 17:47:12 -07:00
Ying Wang
cb99c22476 Use prebuilt for PDK builds. 
Change-Id: Ief723fe137b7a3aa051837e3ca1079fea772357d
 2012-09-20 17:47:04 -07:00
The Android Automerger
038fef81cd JOO82C 2012-09-20 17:46:51 -07:00
Ying Wang
20a7c2c10d Merge "Allow to tag owner to PRODUCT_COPY_FILES" into jb-mr1-dev 2012-09-20 17:12:01 -07:00
Zhihai Xu
d81b9d220e Merge "ISSUE 6849488 Bluedroid stack, remove system/bluetooth." into jb-mr1-dev 2012-09-20 16:42:47 -07:00
Ying Wang
4b0486b4a6 Allow to tag owner to PRODUCT_COPY_FILES 
PRODUCT_COPY_FILES now is a list of words like <source
path>:<destination path>[:<owner>].
The optional :<owner> is used to indicate the owner of a vendor file.

Bug: 7048854
Change-Id: I435d1e18b7a091fb62513062cfc2e420e51557ec
 2012-09-20 16:37:55 -07:00
The Android Automerger
5beb5bb45b JOO82B 2012-09-20 14:44:11 -07:00
Keun young Park
fe1d3b12de Merge "fix PDK build" into jb-mr1-dev 2012-09-20 14:34:48 -07:00
Keun young Park
6530b38d7c fix PDK build 
- build tools not coming from prebuilts for PDK

Change-Id: I5760a54f502b8aa2167976c8f1e17412f31c6f5f
 2012-09-20 14:31:17 -07:00
Ying Wang
7884dfc645 Merge "Move AndroidConfig.h from system/core to the build project." into jb-mr1-dev 2012-09-20 14:07:37 -07:00
Doug Zongker
c4d68391cc Merge "fix merge-event-log-tags.py deprecation warning" into jb-mr1-dev 2012-09-20 12:02:24 -07:00
Doug Zongker
6ce87a1fc8 fix merge-event-log-tags.py deprecation warning 
Prefer using the hashlib module if it's available, instead of the
deprecated md5 module.

Change-Id: Id5e50af125ae47f34d011d8612059424472c7c3f
 2012-09-20 11:50:34 -07:00
Zhihai Xu
3849760809 ISSUE 6849488 Bluedroid stack, remove system/bluetooth. 
remove system/bluetooth stuff.

bug 6849488
Change-Id: I8eb85c6da0aa34aefda2916f2c74e5eae51da27e
 2012-09-20 10:50:56 -07:00
Ying Wang
295cf570d6 Use prebuilt for PDK builds. 
Change-Id: Ief723fe137b7a3aa051837e3ca1079fea772357d
 2012-09-20 10:37:39 -07:00
Ying Wang
5bdf305bbe Move AndroidConfig.h from system/core to the build project. 
So unbundled branches don't need to include the system/core project.

Change-Id: Ic4ef62ee6df069b9b2dd123aed95a3e7fcdfc146
 2012-09-20 10:33:20 -07:00
The Android Automerger
cd22a00c09 JOO82 2012-09-20 07:01:57 -07:00
The Android Automerger
fdbce0eb20 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-20 06:59:18 -07:00
Ying Wang
4da2f9caaa Use prebuilt signapk.jar for unbundled branch. 
Change-Id: I762b23931042f7ffde829aaf928f54df46a49d78
 2012-09-19 17:51:21 -07:00
The Android Automerger
53e104e78c JOO81C 2012-09-19 17:38:33 -07:00