Commit Graph

26306 Commits

Author SHA1 Message Date
Ying Wang
702e01e258 Add LOCAL_FINDBUGS_FLAGS to support custom findbugs flags.
Use LOCAL_FINDBUGS_FLAGS to specify findbugs command line flags.
To use findbugs filters:
LOCAL_FINDBUGS_FLAGS := -exclude $(LOCAL_PATH)/exclude.xml -include \
                        $(LOCAL_PATH)/include.xml

where exclude.xml and include.xml are filter files.
The build system automatically adds the filter files as dependency of
findbugs' output xml.

Bug: 24948760
Change-Id: I82502c0ade910c5255001fa5f390316137ce0be6
2015-10-21 10:30:51 -07:00
Christopher Wiley
597f384fb3 Merge "Invoke the aidl-cpp compiler to generate C++" am: ba39c5690a am: 487cc7beaf
am: 9c694a6242

* commit '9c694a6242a969e27fbd4f043fa7f43ef301b461':
  Invoke the aidl-cpp compiler to generate C++
2015-10-20 20:14:50 +00:00
Christopher Wiley
9c694a6242 Merge "Invoke the aidl-cpp compiler to generate C++" am: ba39c5690a
am: 487cc7beaf

* commit '487cc7beaff3e4fecd92504c1972d6d53079f84e':
  Invoke the aidl-cpp compiler to generate C++
2015-10-19 23:56:48 +00:00
Christopher Wiley
487cc7beaf Merge "Invoke the aidl-cpp compiler to generate C++"
am: ba39c5690a

* commit 'ba39c5690aae0bcd7102c0030a31b705ce1b92f1':
  Invoke the aidl-cpp compiler to generate C++
2015-10-19 23:49:58 +00:00
Christopher Wiley
ba39c5690a Merge "Invoke the aidl-cpp compiler to generate C++" 2015-10-19 23:44:21 +00:00
Ying Wang
d2bae696d1 Merge "envsetup: Show error when supplied dir isn\'t present with mmm" am: 475054a16a am: 3a6ad87039
am: 4c3d8573a3

* commit '4c3d8573a3cfb5012396cf009255dd95f1378c40':
  envsetup: Show error when supplied dir isn't present with mmm
2015-10-19 23:43:26 +00:00
Dan Willemsen
112a39da7d am 3fc56a1f: am 77493047: Merge "Add support for LOCAL_SRC_FILES_EXCLUDE"
am: fa912eb293

* commit 'fa912eb2935aefba2826109ffbd19fd5556c9668':
  Add support for LOCAL_SRC_FILES_EXCLUDE
2015-10-19 23:43:14 +00:00
Ying Wang
4c3d8573a3 Merge "envsetup: Show error when supplied dir isn\'t present with mmm" am: 475054a16a
am: 3a6ad87039

* commit '3a6ad87039910b7fc7bfb078fec8a66d66441d81':
  envsetup: Show error when supplied dir isn't present with mmm
2015-10-19 23:28:27 +00:00
Ying Wang
3a6ad87039 Merge "envsetup: Show error when supplied dir isn\'t present with mmm"
am: 475054a16a

* commit '475054a16ad57b184fa476c093cf1ce8e9ec3e15':
  envsetup: Show error when supplied dir isn't present with mmm
2015-10-19 23:21:46 +00:00
Christopher Wiley
2df75d17a8 Invoke the aidl-cpp compiler to generate C++
Bug: 23599697
Test: test application compiles generated code

Change-Id: I35255517dd0b7ef7a82134be1c862093eaa3ce6b
2015-10-19 16:18:03 -07:00
Ying Wang
475054a16a Merge "envsetup: Show error when supplied dir isn't present with mmm" 2015-10-19 22:44:03 +00:00
Dan Willemsen
fa912eb293 am 3fc56a1f: am 77493047: Merge "Add support for LOCAL_SRC_FILES_EXCLUDE"
* commit '3fc56a1fa18399f9dfaa2d9a7ae2c7aee852d574':
  Add support for LOCAL_SRC_FILES_EXCLUDE
2015-10-19 21:30:20 +00:00
Dan Willemsen
3fc56a1fa1 am 77493047: Merge "Add support for LOCAL_SRC_FILES_EXCLUDE"
* commit '7749304741070af8239e02f68d688fc45fd877d1':
  Add support for LOCAL_SRC_FILES_EXCLUDE
2015-10-19 14:24:53 -07:00
Dan Willemsen
7749304741 Merge "Add support for LOCAL_SRC_FILES_EXCLUDE" 2015-10-19 21:21:40 +00:00
Abhinav1997
a72a6e7c72 envsetup: Show error when supplied dir isn't present with mmm
When a directory isn't present with mmm, don't show "No Android.mk present", rather show that the directory isn't present

Change-Id: I7259a60012c6f30c470daa60d5a5097d01ffc4c7
Signed-off-by: Abhinav1997 <abhinav.jhanwar.august2@gmail.com>
2015-10-19 22:38:42 +02:00
Sami Tolvanen
a749f91191 am 6a14ba31: am 58a748d3: am 87f58261: Merge "Error correction: Append codes to verified partitions"
* commit '6a14ba317cea22f16db3bb76cb818fd7322b8253':
  Error correction: Append codes to verified partitions
2015-10-19 10:07:21 +00:00
Sami Tolvanen
6a14ba317c am 58a748d3: am 87f58261: Merge "Error correction: Append codes to verified partitions"
* commit '58a748d37e0a6f9ec063b374d4f60354def26579':
  Error correction: Append codes to verified partitions
2015-10-19 09:59:12 +00:00
Sami Tolvanen
58a748d37e am 87f58261: Merge "Error correction: Append codes to verified partitions"
* commit '87f582611a5a5c23abf3237abe0e467e46111567':
  Error correction: Append codes to verified partitions
2015-10-19 02:55:51 -07:00
Sami Tolvanen
87f582611a Merge "Error correction: Append codes to verified partitions" 2015-10-19 09:49:18 +00:00
Ying Wang
1b9f8cdde6 am 6129c60a: am cd9545a4: am 4f6f0f92: Merge "If a console doesn\'t exist, read password from stdin."
* commit '6129c60a35fcc81b6336f584191b6e44edd55a51':
  If a console doesn't exist, read password from stdin.
2015-10-18 17:22:15 +00:00
Ying Wang
6129c60a35 am cd9545a4: am 4f6f0f92: Merge "If a console doesn\'t exist, read password from stdin."
* commit 'cd9545a499a1124a52e4edf962c53b83f23ebae8':
  If a console doesn't exist, read password from stdin.
2015-10-18 17:17:28 +00:00
Ying Wang
cd9545a499 am 4f6f0f92: Merge "If a console doesn\'t exist, read password from stdin."
* commit '4f6f0f924eba9f80493861a9e7ff7f40f9924aa2':
  If a console doesn't exist, read password from stdin.
2015-10-18 10:12:27 -07:00
Ying Wang
4f6f0f924e Merge "If a console doesn't exist, read password from stdin." 2015-10-18 17:07:28 +00:00
Tao Bao
988fd485c7 am 5fd65d8d: (-s ours) am 512d7b87: am 1280fa01: am 09ee6daa: am bc5e85af: Merge "DO NOT MERGE releasetools: Always write the last block if it\'s padded." into mnc-dev
* commit '5fd65d8dc542d4aaa6d205781443ea61b5519f41':
  DO NOT MERGE releasetools: Always write the last block if it's padded.
2015-10-17 01:35:54 +00:00
Tao Bao
5fd65d8dc5 am 512d7b87: am 1280fa01: am 09ee6daa: am bc5e85af: Merge "DO NOT MERGE releasetools: Always write the last block if it\'s padded." into mnc-dev
* commit '512d7b87dc04551633d603e1dd97e95d0dcc3565':
  DO NOT MERGE releasetools: Always write the last block if it's padded.
2015-10-17 01:31:49 +00:00
Tao Bao
512d7b87dc am 1280fa01: am 09ee6daa: am bc5e85af: Merge "DO NOT MERGE releasetools: Always write the last block if it\'s padded." into mnc-dev
* commit '1280fa01bd263eac1d31850fe47f8e0aa93cab82':
  DO NOT MERGE releasetools: Always write the last block if it's padded.
2015-10-17 01:27:16 +00:00
Tao Bao
1280fa01bd am 09ee6daa: am bc5e85af: Merge "DO NOT MERGE releasetools: Always write the last block if it\'s padded." into mnc-dev
* commit '09ee6daa7f4d9a526532e77b45aa88bbf1f0776d':
  DO NOT MERGE releasetools: Always write the last block if it's padded.
2015-10-17 01:23:02 +00:00
Tao Bao
09ee6daa7f am bc5e85af: Merge "DO NOT MERGE releasetools: Always write the last block if it\'s padded." into mnc-dev
* commit 'bc5e85afc9cbbbb3c7e7364a6ff2a29cfb596d38':
  DO NOT MERGE releasetools: Always write the last block if it's padded.
2015-10-17 01:19:15 +00:00
Tao Bao
bc5e85afc9 Merge "DO NOT MERGE releasetools: Always write the last block if it's padded." into mnc-dev 2015-10-17 01:15:39 +00:00
Colin Cross
a04abc8e23 Add support for LOCAL_SRC_FILES_EXCLUDE
LOCAL_SRC_FILES_EXCLUDE will be used to filter files out of
LOCAL_SRC_FILES.  A common usage will be to use
LOCAL_SRC_FILES_EXCLUDE_<arch> to remove a source file that will be
replaced with an arch-optimized version.

Change-Id: I75cc6114c47fb784bab65cae8f618c4f395f07bb
2015-10-16 17:33:01 -07:00
Tao Bao
2f9945174d am 15e44d38: (-s ours) am 9cc6c37a: am 5631d5c6: am 46ae586a: am e09359ab: DO NOT MERGE Pass source\'s info_dict to vendor\'s releasetools.py.
* commit '15e44d385739d22719d295ec7f55883180b8fabf':
  DO NOT MERGE Pass source's info_dict to vendor's releasetools.py.
2015-10-17 00:26:53 +00:00
Tao Bao
15e44d3857 am 9cc6c37a: am 5631d5c6: am 46ae586a: am e09359ab: DO NOT MERGE Pass source\'s info_dict to vendor\'s releasetools.py.
* commit '9cc6c37a54626a4d23599fa8d86ffe0bcabec55a':
  DO NOT MERGE Pass source's info_dict to vendor's releasetools.py.
2015-10-17 00:21:47 +00:00
Tao Bao
9cc6c37a54 am 5631d5c6: am 46ae586a: am e09359ab: DO NOT MERGE Pass source\'s info_dict to vendor\'s releasetools.py.
* commit '5631d5c6e12937fd50ef576c6cff1c7ed7c5ae1b':
  DO NOT MERGE Pass source's info_dict to vendor's releasetools.py.
2015-10-17 00:18:27 +00:00
Tao Bao
5631d5c6e1 am 46ae586a: am e09359ab: DO NOT MERGE Pass source\'s info_dict to vendor\'s releasetools.py.
* commit '46ae586ab26f5bf63baaac6c68942f1bfba4addc':
  DO NOT MERGE Pass source's info_dict to vendor's releasetools.py.
2015-10-17 00:13:36 +00:00
Tao Bao
46ae586ab2 am e09359ab: DO NOT MERGE Pass source\'s info_dict to vendor\'s releasetools.py.
* commit 'e09359abc0f8c29fbb16d35ab7375d80fde6f931':
  DO NOT MERGE Pass source's info_dict to vendor's releasetools.py.
2015-10-17 00:09:35 +00:00
Tao Bao
d4790e9732 am 88aea006: am 6ce8ae76: am ac39bef4: Merge "common.py: Fix the build."
* commit '88aea00628cb3d90f6674f7762a8ed9f793d06cb':
  common.py: Fix the build.
2015-10-16 23:33:09 +00:00
Tao Bao
4b9892ad19 common.py: Fix the build.
Should only use source_info_dict when creating incremental OTAs.

Change-Id: I3305632aab3334f5e6a555cde7ef0c311965c4b8
(cherry picked from commit aac4ad56b6)
2015-10-16 16:07:52 -07:00
Tao Bao
88aea00628 am 6ce8ae76: am ac39bef4: Merge "common.py: Fix the build."
* commit '6ce8ae761b8a238ce215638510230baed277235f':
  common.py: Fix the build.
2015-10-16 22:50:39 +00:00
Tao Bao
e09359abc0 DO NOT MERGE Pass source's info_dict to vendor's releasetools.py.
When building incremental packages, the info_dict from the source build
should be the one in use. We have done that for most of the partitions
(system and etc.), and should pass that to vendor's script as well.

Also includes the CL in commit aac4ad56b6
that fixes a bug in commit 6f0b219ac5.

Bug: 24898607
Change-Id: I4ea6037dad7061e1683661fc4c394fa3a7a7c5cd
(cherry picked from commit 6f0b219ac5)
2015-10-16 15:47:51 -07:00
Tao Bao
6ce8ae761b am ac39bef4: Merge "common.py: Fix the build."
* commit 'ac39bef43fb032bff75b8558f54107e733355265':
  common.py: Fix the build.
2015-10-16 15:46:31 -07:00
Tao Bao
ac39bef43f Merge "common.py: Fix the build." 2015-10-16 22:41:45 +00:00
Tao Bao
aac4ad56b6 common.py: Fix the build.
Should only use source_info_dict when creating incremental OTAs.

Change-Id: I6a4e5f8fa3613a1b36563ec915e433247965a2b8
2015-10-16 15:28:00 -07:00
Tao Bao
7e32e596b0 am db078f51: am 63e63c2a: am 543b28d4: Merge "Pass source\'s info_dict to vendor\'s releasetools.py."
* commit 'db078f5166ca0cdfbf39f3bb9a983a2207d7a7e1':
  Pass source's info_dict to vendor's releasetools.py.
2015-10-16 22:04:27 +00:00
Tao Bao
db078f5166 am 63e63c2a: am 543b28d4: Merge "Pass source\'s info_dict to vendor\'s releasetools.py."
* commit '63e63c2a0754e726d6f810588a0314a79268f404':
  Pass source's info_dict to vendor's releasetools.py.
2015-10-16 21:55:46 +00:00
Tao Bao
63e63c2a07 am 543b28d4: Merge "Pass source\'s info_dict to vendor\'s releasetools.py."
* commit '543b28d42f8fdebe011a906826251ab8df70a226':
  Pass source's info_dict to vendor's releasetools.py.
2015-10-16 14:49:40 -07:00
Tao Bao
3203bc10f0 DO NOT MERGE releasetools: Always write the last block if it's padded.
In BBOTAs if the last block of a DataImage is padded, we should always
write the whole block even for incremental OTAs. Because otherwise the
last block may be skipped if unchanged, but would fail the post-install
verification if it has non-zero contents in the padding bytes.

Bug: 24981812
Change-Id: Id0608384fcff0375aec8c158e6f909569b873d31
(cherry picked from commit 7589e961a7)
2015-10-16 14:46:46 -07:00
Tao Bao
543b28d42f Merge "Pass source's info_dict to vendor's releasetools.py." 2015-10-16 21:42:34 +00:00
Ying Wang
76203dcc4c am 08785f11: am 19fcc054: am 19e4741d: Merge "Use direct dependency on the JNI so files."
* commit '08785f116b2f947e8d5a12ae4d1612d82f860d91':
  Use direct dependency on the JNI so files.
2015-10-16 12:08:04 +00:00
Ying Wang
08785f116b am 19fcc054: am 19e4741d: Merge "Use direct dependency on the JNI so files."
* commit '19fcc054bd489799408691bbb933ff2d6cea7a4a':
  Use direct dependency on the JNI so files.
2015-10-16 01:29:58 +00:00
Ying Wang
19fcc054bd am 19e4741d: Merge "Use direct dependency on the JNI so files."
* commit '19e4741df60643d4fdb876e77069bb63857a12b2':
  Use direct dependency on the JNI so files.
2015-10-16 01:25:15 +00:00