diff --git a/android-tools.spec b/android-tools.spec index 7c1c142..6a7bd74 100644 --- a/android-tools.spec +++ b/android-tools.spec @@ -1,8 +1,8 @@ -%global date 20160321 -%global git_commit 922e151ba2d8 +%global date 20160327 +%global git_commit 3761365735de %global packdname core-%{git_commit} -%global extras_git_commit ea4a5a4 +%global extras_git_commit 7f5999a %global extras_packdname extras-%{extras_git_commit} %global _hardened_build 1 @@ -38,6 +38,7 @@ BuildRequires: libselinux-devel BuildRequires: f2fs-tools-devel BuildRequires: gtest-devel BuildRequires: systemd +BuildRequires: ruby Provides: adb Provides: fastboot @@ -99,7 +100,10 @@ install -p -D -m 0644 %{SOURCE6} \ %changelog -* Wed Mar 26 2016 Ivan Afonichev - 20160321git922e151ba2d8-1 +* Sun Mar 27 2016 Ivan Afonichev - 20160327git3761365735de-1 +- Update to upstream git commit 3761365735de + +* Sat Mar 26 2016 Ivan Afonichev - 20160321git922e151ba2d8-1 - Update to upstream git commit 922e151ba2d8 - Resolves: rhbz 1278769 1318099 Migrate to ruby generate_build. Support new versions diff --git a/generate_build.rb b/generate_build.rb index 6ff62e5..18a8674 100644 --- a/generate_build.rb +++ b/generate_build.rb @@ -98,10 +98,14 @@ basefiles = %w( libbase = compile(expand('base', basefiles), '-DADB_HOST=1 -D_GNU_SOURCE -Ibase/include -Iinclude') logfiles = %w( - logd_write.c + logger_write.c + config_write.c + logger_lock.c + logger_name.c log_event_list.c log_event_write.c fake_log_device.c + fake_writer.c ) liblog = compile(expand('liblog', logfiles), '-DLIBLOG_LOG_TAG=1005 -DFAKE_LOG_DEVICE=1 -D_GNU_SOURCE -Ilog/include -Iinclude') diff --git a/sources b/sources index afa176c..d35fb7e 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -25e74fdf830ed1d7ea4ac5e4d81830c4 core-922e151ba2d8.tar.xz -fa12e4f713657844216c6870ab6c93ab extras-ea4a5a4.tar.xz +bdccaa042b73d1f5a29630c69ae5df26 core-3761365735de.tar.xz +2cd5ea576fdf35f5e9ee1c208f6d9fa5 extras-7f5999a.tar.xz